Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #18

Browse Source
This commit is contained in:
Stéphane Lepin 2016-12-04 20:38:49 +01:00
parent 1a057cf5a3
commit 32932eacf5
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
WSEvents.cpp
View File

@ -92,15 +92,28 @@ void WSEvents::broadcastUpdate(const char *updateType, obs_data_t *additionalFie
void WSEvents::OnSceneChange() { void WSEvents::OnSceneChange() {
// Implements an existing update type from bilhamil's OBS Remote // Implements an existing update type from bilhamil's OBS Remote
// Default behavior : get the new scene from the running transition
obs_source_t *transition = obs_frontend_get_current_transition(); obs_source_t *transition = obs_frontend_get_current_transition();
obs_source_t *new_scene = obs_transition_get_source(transition, OBS_TRANSITION_SOURCE_B); obs_source_t *new_scene = obs_transition_get_source(transition, OBS_TRANSITION_SOURCE_B);
if (!new_scene) { if (!new_scene) {
obs_source_release(transition); obs_source_release(transition);
return; return;
} }
const char *scene_name = obs_source_get_name(new_scene);
if (!scene_name) {
// Fallback behaviour : get the new scene straight from the API
obs_source_release(new_scene);
new_scene = obs_frontend_get_current_scene();
if (new_scene) {
scene_name = obs_source_get_name(new_scene);
}
}
obs_data_t *data = obs_data_create(); obs_data_t *data = obs_data_create();
obs_data_set_string(data, "scene-name", obs_source_get_name(new_scene)); obs_data_set_string(data, "scene-name", scene_name);
broadcastUpdate("SwitchScenes", data); broadcastUpdate("SwitchScenes", data);