Events: Add from and to scene names to transition events

These scene names are missing to make these events useful for anything other than monitoring

Author: duncte123

src/eventhandler/EventHandler_Transitions.cpp

@@ -63,11 +63,31 @@ void EventHandler::HandleCurrentSceneTransitionDurationChanged()
 	BroadcastEvent(EventSubscription::Transitions, "CurrentSceneTransitionDurationChanged", eventData);
 }
 
+void SetFromAndToScene(json &eventData, obs_source_t *transition)
+{
+	OBSSourceAutoRelease sourceScene = obs_transition_get_source(transition, OBS_TRANSITION_SOURCE_A);
+	OBSSourceAutoRelease destinationScene = obs_transition_get_source(transition, OBS_TRANSITION_SOURCE_B);
+
+	eventData["fromScene"] = obs_source_get_name(sourceScene);
+	eventData["toScene"] = obs_source_get_name(destinationScene);
+}
+
+// FIXME: OBS bug causes source B to be null for transition end but not video transition end.
+// Needs to be fixed in obs itself
+void SetToScene(json &eventData, obs_source_t *transition)
+{
+	OBSSourceAutoRelease sourceScene = obs_transition_get_source(transition, OBS_TRANSITION_SOURCE_A);
+
+	eventData["toScene"] = obs_source_get_name(sourceScene);
+}
+
 /**
  * A scene transition has started.
  *
  * @dataField transitionName | String | Scene transition name
  * @dataField transitionUuid | String | Scene transition UUID
+ * @dataField toScene | String | Scene that we transitioned to
+ * @dataField fromScene | String | Scene that we transitioned away from
  *
  * @eventType SceneTransitionStarted
  * @eventSubscription Transitions
@@ -88,6 +108,9 @@ void EventHandler::HandleSceneTransitionStarted(void *param, calldata_t *data)
 	json eventData;
 	eventData["transitionName"] = obs_source_get_name(source);
 	eventData["transitionUuid"] = obs_source_get_uuid(source);
+
+	SetFromAndToScene(eventData, source);
+
 	eventHandler->BroadcastEvent(EventSubscription::Transitions, "SceneTransitionStarted", eventData);
 }
 
@@ -98,6 +121,7 @@ void EventHandler::HandleSceneTransitionStarted(void *param, calldata_t *data)
  *
  * @dataField transitionName | String | Scene transition name
  * @dataField transitionUuid | String | Scene transition UUID
+ * @dataField toScene | String | Scene that we transitioned to
  *
  * @eventType SceneTransitionEnded
  * @eventSubscription Transitions
@@ -118,6 +142,9 @@ void EventHandler::HandleSceneTransitionEnded(void *param, calldata_t *data)
 	json eventData;
 	eventData["transitionName"] = obs_source_get_name(source);
 	eventData["transitionUuid"] = obs_source_get_uuid(source);
+
+	SetToScene(eventData, source);
+
 	eventHandler->BroadcastEvent(EventSubscription::Transitions, "SceneTransitionEnded", eventData);
 }
 
@@ -131,6 +158,8 @@ void EventHandler::HandleSceneTransitionEnded(void *param, calldata_t *data)
  *
  * @dataField transitionName | String | Scene transition name
  * @dataField transitionUuid | String | Scene transition UUID
+ * @dataField toScene | String | Scene that we transitioned to
+ * @dataField fromScene | String | Scene that we transitioned away from
  *
  * @eventType SceneTransitionVideoEnded
  * @eventSubscription Transitions
@@ -151,5 +180,8 @@ void EventHandler::HandleSceneTransitionVideoEnded(void *param, calldata_t *data
 	json eventData;
 	eventData["transitionName"] = obs_source_get_name(source);
 	eventData["transitionUuid"] = obs_source_get_uuid(source);
+
+	SetFromAndToScene(eventData, source);
+
 	eventHandler->BroadcastEvent(EventSubscription::Transitions, "SceneTransitionVideoEnded", eventData);
 }