Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-22 09:15:57 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix data loss for sequence delay

Browse Source
This commit is contained in:
WarmUpTill
2020-08-02 19:37:37 +02:00
parent 3c1e240722
commit 2f33b6bdc3
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/headers/switcher-data-structs.hpp
View File

@@ -104,7 +104,7 @@ struct SceneRoundTripSwitch {
inline SceneRoundTripSwitch(OBSWeakSource scene1_,
OBSWeakSource scene2_,
OBSWeakSource transition_, int delay_,
OBSWeakSource transition_, double delay_,
bool usePreviousScene_, std::string str)
: scene1(scene1_),
scene2(scene2_),

14
src/scene-round-trip.cpp
View File

@@ -368,12 +368,12 @@ void SwitcherData::loadSceneRoundTripSwitches(obs_data_t *obj)
// To be removed in future version
// to be compatible with older versions
if (!obs_data_has_user_value(array_obj, "delay")) {
delay = obs_data_get_int(array_obj,
"sceneRoundTripDelay");
delay = delay * 1000 +
obs_data_get_int(array_obj,
"sceneRoundTripDelayMs");
delay /= 1000;
delay = double(obs_data_get_int(array_obj,
"sceneRoundTripDelay"));
delay = delay * 1000. +
double(obs_data_get_int(
array_obj, "sceneRoundTripDelayMs"));
delay /= 1000.;
} else {
delay = obs_data_get_double(array_obj, "delay");
}
@@ -402,7 +402,7 @@ void SceneSwitcher::setupSequenceTab()
populateSceneSelection(ui->sceneRoundTripScenes2, true);
populateTransitionSelection(ui->sceneRoundTripTransitions);
int smallestDelay = switcher->interval;
double smallestDelay = double(switcher->interval) / 1000;
for (auto &s : switcher->sceneRoundTripSwitches) {
std::string sceneName1 = GetWeakSourceName(s.scene1);
std::string sceneName2 = (s.usePreviousScene)