diff --git a/src/eventhandler/EventHandler.cpp b/src/eventhandler/EventHandler.cpp index 05e46ab6f..cbbd54701 100644 --- a/src/eventhandler/EventHandler.cpp +++ b/src/eventhandler/EventHandler.cpp @@ -82,8 +82,6 @@ void EventHandler::ProcessSubscriptionChange(bool type, uint64_t eventSubscripti _inputActiveStateChangedRef++; if ((eventSubscriptions & EventSubscription::InputShowStateChanged) != 0) _inputShowStateChangedRef++; - if ((eventSubscriptions & EventSubscription::SceneItemTransformChanged) != 0) - _sceneItemTransformChangedRef++; } else { if ((eventSubscriptions & EventSubscription::InputVolumeMeters) != 0) { if (_inputVolumeMetersRef.fetch_sub(1) == 1) @@ -93,8 +91,6 @@ void EventHandler::ProcessSubscriptionChange(bool type, uint64_t eventSubscripti _inputActiveStateChangedRef--; if ((eventSubscriptions & EventSubscription::InputShowStateChanged) != 0) _inputShowStateChangedRef--; - if ((eventSubscriptions & EventSubscription::SceneItemTransformChanged) != 0) - _sceneItemTransformChangedRef--; } } diff --git a/src/eventhandler/EventHandler.h b/src/eventhandler/EventHandler.h index 0811c52a5..191b4ae7d 100644 --- a/src/eventhandler/EventHandler.h +++ b/src/eventhandler/EventHandler.h @@ -58,7 +58,6 @@ class EventHandler { std::atomic _inputVolumeMetersRef = 0; std::atomic _inputActiveStateChangedRef = 0; std::atomic _inputShowStateChangedRef = 0; - std::atomic _sceneItemTransformChangedRef = 0; void ConnectSourceSignals(obs_source_t *source); void DisconnectSourceSignals(obs_source_t *source); diff --git a/src/eventhandler/EventHandler_SceneItems.cpp b/src/eventhandler/EventHandler_SceneItems.cpp index bad166321..ff2b76822 100644 --- a/src/eventhandler/EventHandler_SceneItems.cpp +++ b/src/eventhandler/EventHandler_SceneItems.cpp @@ -248,7 +248,7 @@ void EventHandler::HandleSceneItemSelected(void *param, calldata_t *data) * @dataField sceneItemTransform | Object | New transform/crop info of the scene item * * @eventType SceneItemTransformChanged - * @eventSubscription SceneItemTransformChanged + * @eventSubscription SceneItems * @complexity 4 * @rpcVersion -1 * @initialVersion 5.0.0 @@ -259,9 +259,6 @@ void EventHandler::HandleSceneItemTransformChanged(void *param, calldata_t *data { auto eventHandler = static_cast(param); - if (!eventHandler->_sceneItemTransformChangedRef.load()) - return; - obs_scene_t *scene = GetCalldataPointer(data, "scene"); if (!scene) return; @@ -275,5 +272,5 @@ void EventHandler::HandleSceneItemTransformChanged(void *param, calldata_t *data eventData["sceneUuid"] = obs_source_get_uuid(obs_scene_get_source(scene)); eventData["sceneItemId"] = obs_sceneitem_get_id(sceneItem); eventData["sceneItemTransform"] = Utils::Obs::ObjectHelper::GetSceneItemTransform(sceneItem); - eventHandler->BroadcastEvent(EventSubscription::SceneItemTransformChanged, "SceneItemTransformChanged", eventData); + eventHandler->BroadcastEvent(EventSubscription::SceneItems, "SceneItemTransformChanged", eventData); } diff --git a/src/eventhandler/types/EventSubscription.h b/src/eventhandler/types/EventSubscription.h index e996bddf0..d00979da6 100644 --- a/src/eventhandler/types/EventSubscription.h +++ b/src/eventhandler/types/EventSubscription.h @@ -198,16 +198,5 @@ namespace EventSubscription { * @api enums */ InputShowStateChanged = (1 << 18), - /** - * Subscription value to receive the `SceneItemTransformChanged` high-volume event. - * - * @enumIdentifier SceneItemTransformChanged - * @enumValue (1 << 19) - * @enumType EventSubscription - * @rpcVersion -1 - * @initialVersion 5.0.0 - * @api enums - */ - SceneItemTransformChanged = (1 << 19), }; }