Skip to content

Commit d80fe13

Browse files
committed
HandleSceneItemTransformChanged Event handler fix
1 parent 68bebc2 commit d80fe13

File tree

4 files changed

+2
-21
lines changed

4 files changed

+2
-21
lines changed

src/eventhandler/EventHandler.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ void EventHandler::ProcessSubscriptionChange(bool type, uint64_t eventSubscripti
8787
_inputActiveStateChangedRef++;
8888
if ((eventSubscriptions & EventSubscription::InputShowStateChanged) != 0)
8989
_inputShowStateChangedRef++;
90-
if ((eventSubscriptions & EventSubscription::SceneItemTransformChanged) != 0)
91-
_sceneItemTransformChangedRef++;
9290
} else {
9391
if ((eventSubscriptions & EventSubscription::InputVolumeMeters) != 0) {
9492
if (_inputVolumeMetersRef.fetch_sub(1) == 1)
@@ -98,8 +96,6 @@ void EventHandler::ProcessSubscriptionChange(bool type, uint64_t eventSubscripti
9896
_inputActiveStateChangedRef--;
9997
if ((eventSubscriptions & EventSubscription::InputShowStateChanged) != 0)
10098
_inputShowStateChangedRef--;
101-
if ((eventSubscriptions & EventSubscription::SceneItemTransformChanged) != 0)
102-
_sceneItemTransformChangedRef--;
10399
}
104100
}
105101

src/eventhandler/EventHandler.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ class EventHandler {
5858
std::atomic<uint64_t> _inputVolumeMetersRef = 0;
5959
std::atomic<uint64_t> _inputActiveStateChangedRef = 0;
6060
std::atomic<uint64_t> _inputShowStateChangedRef = 0;
61-
std::atomic<uint64_t> _sceneItemTransformChangedRef = 0;
6261

6362
void ConnectSourceSignals(obs_source_t *source);
6463
void DisconnectSourceSignals(obs_source_t *source);

src/eventhandler/EventHandler_SceneItems.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ void EventHandler::HandleSceneItemSelected(void *param, calldata_t *data)
272272
* @dataField sceneItemTransform | Object | New transform/crop info of the scene item
273273
*
274274
* @eventType SceneItemTransformChanged
275-
* @eventSubscription SceneItemTransformChanged
275+
* @eventSubscription SceneItems
276276
* @complexity 4
277277
* @rpcVersion -1
278278
* @initialVersion 5.0.0
@@ -283,9 +283,6 @@ void EventHandler::HandleSceneItemTransformChanged(void *param, calldata_t *data
283283
{
284284
auto eventHandler = static_cast<EventHandler *>(param);
285285

286-
if (!eventHandler->_sceneItemTransformChangedRef.load())
287-
return;
288-
289286
obs_scene_t *scene = GetCalldataPointer<obs_scene_t>(data, "scene");
290287
if (!scene)
291288
return;
@@ -303,5 +300,5 @@ void EventHandler::HandleSceneItemTransformChanged(void *param, calldata_t *data
303300
eventData["sceneUuid"] = obs_source_get_uuid(obs_scene_get_source(scene));
304301
eventData["sceneItemId"] = obs_sceneitem_get_id(sceneItem);
305302
eventData["sceneItemTransform"] = Utils::Obs::ObjectHelper::GetSceneItemTransform(sceneItem);
306-
eventHandler->BroadcastEvent(EventSubscription::SceneItemTransformChanged, "SceneItemTransformChanged", eventData);
303+
eventHandler->BroadcastEvent(EventSubscription::SceneItems, "SceneItemTransformChanged", eventData);
307304
}

src/eventhandler/types/EventSubscription.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -209,16 +209,5 @@ namespace EventSubscription {
209209
* @api enums
210210
*/
211211
InputShowStateChanged = (1 << 18),
212-
/**
213-
* Subscription value to receive the `SceneItemTransformChanged` high-volume event.
214-
*
215-
* @enumIdentifier SceneItemTransformChanged
216-
* @enumValue (1 << 19)
217-
* @enumType EventSubscription
218-
* @rpcVersion -1
219-
* @initialVersion 5.0.0
220-
* @api enums
221-
*/
222-
SceneItemTransformChanged = (1 << 19),
223212
};
224213
}

0 commit comments

Comments
 (0)