Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-04-04 16:25:39 -05:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Clean up loading of transition tab settings

Browse Source
This commit is contained in:
WarmUpTill 2021-05-01 22:03:45 +02:00 committed by WarmUpTill
parent 3f492f468a
commit 2e1d660e17
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/switch-transitions.cpp
View File

@ -351,18 +351,8 @@ void SwitcherData::loadSceneTransitions(obs_data_t *obj)
for (size_t i = 0; i < count; i++) {
obs_data_t *array_obj =
obs_data_array_item(sceneTransitionsArray, i);
const char *scene1 = obs_data_get_string(array_obj, "Scene1");
const char *scene2 = obs_data_get_string(array_obj, "Scene2");
const char *transition =
obs_data_get_string(array_obj, "transition");
double duration = obs_data_get_double(array_obj, "duration");
sceneTransitions.emplace_back(
GetWeakSourceByName(scene1),
GetWeakSourceByName(scene2),
GetWeakTransitionByName(transition), duration);
sceneTransitions.emplace_back();
sceneTransitions.back().load(array_obj);
obs_data_release(array_obj);
}
obs_data_array_release(sceneTransitionsArray);
@ -376,15 +366,8 @@ void SwitcherData::loadSceneTransitions(obs_data_t *obj)
for (size_t i = 0; i < count; i++) {
obs_data_t *array_obj =
obs_data_array_item(defaultTransitionsArray, i);
const char *scene = obs_data_get_string(array_obj, "Scene");
const char *transition =
obs_data_get_string(array_obj, "transition");
defaultSceneTransitions.emplace_back(
GetWeakSourceByName(scene),
GetWeakTransitionByName(transition));
defaultSceneTransitions.emplace_back();
defaultSceneTransitions.back().load(array_obj);
obs_data_release(array_obj);
}
obs_data_array_release(defaultTransitionsArray);