4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Add preload callbacks to frontend API

Browse source 
Allows loading data before actually loading any scene data.
This commit is contained in:
jp9000 2017-12-25 13:23:39 -08:00
commit 5645c02c8f
5 changed files with 61 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
UI/window-basic-main.cpp
View file

@ -762,6 +762,10 @@ void OBSBasic::Load(const char *file)
ClearSceneData();
InitDefaultTransitions();
obs_data_t *modulesObj = obs_data_get_obj(data, "modules");
if (api)
api->on_preload(modulesObj);
obs_data_array_t *sceneOrder = obs_data_get_array(data, "scene_order");
obs_data_array_t *sources = obs_data_get_array(data, "sources");
obs_data_array_t *transitions= obs_data_get_array(data, "transitions");
@ -925,12 +929,10 @@ retryScene:
/* ---------------------- */
if (api) {
obs_data_t *modulesObj = obs_data_get_obj(data, "modules");
if (api)
api->on_load(modulesObj);
obs_data_release(modulesObj);
}
obs_data_release(modulesObj);
obs_data_release(data);
if (!opt_starting_scene.empty())