mirror of
				https://github.com/hyperion-project/hyperion.ng.git
				synced 2025-03-01 10:33:28 +00:00 
			
		
		
		
	Revert streaming subscription names
This commit is contained in:
		| @@ -38,9 +38,9 @@ public: | |||||||
| #endif | #endif | ||||||
| 		case EventUpdate: return "event-update"; | 		case EventUpdate: return "event-update"; | ||||||
| 		case ImageToLedMappingUpdate: return "imageToLedMapping-update"; | 		case ImageToLedMappingUpdate: return "imageToLedMapping-update"; | ||||||
| 		case ImageUpdate: return "image-update"; | 		case ImageUpdate: return "ledcolors-imagestream-update"; | ||||||
| 		case InstanceUpdate: return "instance-update"; | 		case InstanceUpdate: return "instance-update"; | ||||||
| 		case LedColorsUpdate: return "led-colors-update"; | 		case LedColorsUpdate: return "ledcolors-ledstream-update"; | ||||||
| 		case LedsUpdate: return "leds-update"; | 		case LedsUpdate: return "leds-update"; | ||||||
| 		case LogMsgUpdate: return "logmsg-update"; | 		case LogMsgUpdate: return "logmsg-update"; | ||||||
| 		case PrioritiesUpdate: return "priorities-update"; | 		case PrioritiesUpdate: return "priorities-update"; | ||||||
| @@ -51,7 +51,7 @@ public: | |||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
| 	static bool isInstacneSpecific(Type type) { | 	static bool isInstanceSpecific(Type type) { | ||||||
| 		switch (type) { | 		switch (type) { | ||||||
| 		case AdjustmentUpdate: | 		case AdjustmentUpdate: | ||||||
| 		case ComponentsUpdate: | 		case ComponentsUpdate: | ||||||
| @@ -114,9 +114,9 @@ public: | |||||||
| #endif | #endif | ||||||
| 			{ {"event-update"}, { Subscription::EventUpdate, true} }, | 			{ {"event-update"}, { Subscription::EventUpdate, true} }, | ||||||
| 			{ {"imageToLedMapping-update"}, { Subscription::ImageToLedMappingUpdate, true} }, | 			{ {"imageToLedMapping-update"}, { Subscription::ImageToLedMappingUpdate, true} }, | ||||||
| 			{ {"image-update"}, { Subscription::ImageUpdate, false} }, | 			{ {"ledcolors-imagestream-update"}, { Subscription::ImageUpdate, false} }, | ||||||
| 			{ {"instance-update"}, { Subscription::InstanceUpdate, true} }, | 			{ {"instance-update"}, { Subscription::InstanceUpdate, true} }, | ||||||
| 			{ {"led-colors-update"}, { Subscription::LedColorsUpdate, true} }, | 			{ {"ledcolors-ledstream-update"}, { Subscription::LedColorsUpdate, true} }, | ||||||
| 			{ {"leds-update"}, { Subscription::LedsUpdate, false} }, | 			{ {"leds-update"}, { Subscription::LedsUpdate, false} }, | ||||||
| 			{ {"logmsg-update"}, { Subscription::LogMsgUpdate, false} }, | 			{ {"logmsg-update"}, { Subscription::LogMsgUpdate, false} }, | ||||||
| 			{ {"priorities-update"}, { Subscription::PrioritiesUpdate, true} }, | 			{ {"priorities-update"}, { Subscription::PrioritiesUpdate, true} }, | ||||||
|   | |||||||
| @@ -285,7 +285,7 @@ void JsonCallbacks::doCallback(Subscription::Type cmd, const QVariant& data) | |||||||
| 	QJsonObject obj; | 	QJsonObject obj; | ||||||
| 	obj["command"] = Subscription::toString(cmd); | 	obj["command"] = Subscription::toString(cmd); | ||||||
|  |  | ||||||
| 	if (Subscription::isInstacneSpecific(cmd)) | 	if (Subscription::isInstanceSpecific(cmd)) | ||||||
| 	{ | 	{ | ||||||
| 		obj["instance"] = _hyperion->getInstanceIndex(); | 		obj["instance"] = _hyperion->getInstanceIndex(); | ||||||
| 	} | 	} | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user