jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Trigger frontend api scene change after transition

Browse Source 
Changes the OBS_FRONTEND_EVENT_SCENE_CHANGED event after transitioning
is complete rather than right when the user hits a scene change.
This commit is contained in:
jp9000 2017-02-22 03:08:37 -08:00
parent 32f60d07a3
commit b2bdf96cd6
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
UI/window-basic-main-transitions.cpp
View File

@ -234,8 +234,10 @@ void OBSBasic::TransitionStopped()
SetCurrentScene(scene);
}
if (api)
if (api) {
api->on_event(OBS_FRONTEND_EVENT_TRANSITION_STOPPED);
api->on_event(OBS_FRONTEND_EVENT_SCENE_CHANGED);
}
swapScene = nullptr;
}
@ -274,19 +276,19 @@ void OBSBasic::TransitionToScene(OBSSource source, bool force)
obs_source_t *transition = obs_get_output_source(0);
if (force)
if (force) {
obs_transition_set(transition, source);
else
if (api)
api->on_event(OBS_FRONTEND_EVENT_SCENE_CHANGED);
} else {
obs_transition_start(transition, OBS_TRANSITION_MODE_AUTO,
ui->transitionDuration->value(), source);
}
if (usingPreviewProgram && sceneDuplicationMode)
obs_scene_release(scene);
obs_source_release(transition);
if (api)
api->on_event(OBS_FRONTEND_EVENT_SCENE_CHANGED);
}
static inline void SetComboTransition(QComboBox *combo, obs_source_t *tr)