Skip to content

HandleSceneItemTransformChanged Event handler fix #1312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

HandleSceneItemTransformChanged Event handler fix #1312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/eventhandler/EventHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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--;
}
}

Expand Down
1 change: 0 additions & 1 deletion src/eventhandler/EventHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ class EventHandler {
std::atomic<uint64_t> _inputVolumeMetersRef = 0;
std::atomic<uint64_t> _inputActiveStateChangedRef = 0;
std::atomic<uint64_t> _inputShowStateChangedRef = 0;
std::atomic<uint64_t> _sceneItemTransformChangedRef = 0;

void ConnectSourceSignals(obs_source_t *source);
void DisconnectSourceSignals(obs_source_t *source);
Expand Down
7 changes: 2 additions & 5 deletions src/eventhandler/EventHandler_SceneItems.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -259,9 +259,6 @@ void EventHandler::HandleSceneItemTransformChanged(void *param, calldata_t *data
{
auto eventHandler = static_cast<EventHandler *>(param);

if (!eventHandler->_sceneItemTransformChangedRef.load())
return;

obs_scene_t *scene = GetCalldataPointer<obs_scene_t>(data, "scene");
if (!scene)
return;
Expand All @@ -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);
}
11 changes: 0 additions & 11 deletions src/eventhandler/types/EventSubscription.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
};
}