From 5ab4b11e713ec3608183af2e44fe259a2a83fda0 Mon Sep 17 00:00:00 2001 From: LordGrey <48840279+Lord-Grey@users.noreply.github.com> Date: Fri, 26 Apr 2024 19:41:41 +0200 Subject: [PATCH] Revert streaming subscription names --- include/api/JsonApiSubscription.h | 10 +++++----- libsrc/api/JsonCallbacks.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/api/JsonApiSubscription.h b/include/api/JsonApiSubscription.h index e090e319..5f692ca4 100644 --- a/include/api/JsonApiSubscription.h +++ b/include/api/JsonApiSubscription.h @@ -38,9 +38,9 @@ public: #endif case EventUpdate: return "event-update"; case ImageToLedMappingUpdate: return "imageToLedMapping-update"; - case ImageUpdate: return "image-update"; + case ImageUpdate: return "ledcolors-imagestream-update"; case InstanceUpdate: return "instance-update"; - case LedColorsUpdate: return "led-colors-update"; + case LedColorsUpdate: return "ledcolors-ledstream-update"; case LedsUpdate: return "leds-update"; case LogMsgUpdate: return "logmsg-update"; case PrioritiesUpdate: return "priorities-update"; @@ -51,7 +51,7 @@ public: } } - static bool isInstacneSpecific(Type type) { + static bool isInstanceSpecific(Type type) { switch (type) { case AdjustmentUpdate: case ComponentsUpdate: @@ -114,9 +114,9 @@ public: #endif { {"event-update"}, { Subscription::EventUpdate, true} }, { {"imageToLedMapping-update"}, { Subscription::ImageToLedMappingUpdate, true} }, - { {"image-update"}, { Subscription::ImageUpdate, false} }, + { {"ledcolors-imagestream-update"}, { Subscription::ImageUpdate, false} }, { {"instance-update"}, { Subscription::InstanceUpdate, true} }, - { {"led-colors-update"}, { Subscription::LedColorsUpdate, true} }, + { {"ledcolors-ledstream-update"}, { Subscription::LedColorsUpdate, true} }, { {"leds-update"}, { Subscription::LedsUpdate, false} }, { {"logmsg-update"}, { Subscription::LogMsgUpdate, false} }, { {"priorities-update"}, { Subscription::PrioritiesUpdate, true} }, diff --git a/libsrc/api/JsonCallbacks.cpp b/libsrc/api/JsonCallbacks.cpp index a8d8685f..26db247e 100644 --- a/libsrc/api/JsonCallbacks.cpp +++ b/libsrc/api/JsonCallbacks.cpp @@ -285,7 +285,7 @@ void JsonCallbacks::doCallback(Subscription::Type cmd, const QVariant& data) QJsonObject obj; obj["command"] = Subscription::toString(cmd); - if (Subscription::isInstacneSpecific(cmd)) + if (Subscription::isInstanceSpecific(cmd)) { obj["instance"] = _hyperion->getInstanceIndex(); }