Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-28 04:06:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove runtime of check() functions from interval sleep

Browse Source
This commit is contained in:
WarmUpTill
2020-12-09 22:39:38 +01:00
committed by WarmUpTill
parent 9711390aac
commit 41f34f8f40
1 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/advanced-scene-switcher.cpp
View File

@@ -329,29 +329,45 @@ void SwitcherData::Thread()
{
blog(LOG_INFO, "started");
int sleep = 0;
std::chrono::milliseconds duration;
auto startTime = std::chrono::high_resolution_clock::now();
auto endTime = std::chrono::high_resolution_clock::now();
while (true) {
std::unique_lock<std::mutex> lock(m);
bool match = false;
OBSWeakSource scene;
OBSWeakSource transition;
bool defTransitionMatch = false;
OBSWeakSource defTransition;
std::chrono::milliseconds duration;
if (sleep > interval) {
endTime = std::chrono::high_resolution_clock::now();
auto runTime =
std::chrono::duration_cast<std::chrono::milliseconds>(
endTime - startTime);
if (sleep) {
duration = std::chrono::milliseconds(sleep);
if (verbose)
blog(LOG_INFO, "sleep for %d", sleep);
} else {
duration = std::chrono::milliseconds(interval);
if (verbose)
blog(LOG_INFO, "sleep for %d", interval);
duration =
std::chrono::milliseconds(interval) - runTime;
if (duration.count() < 0)
duration = std::chrono::milliseconds(0);
}
sleep = 0;
switcher->Prune();
writeSceneInfoToFile();
//sleep for a bit
if (verbose)
blog(LOG_INFO, "sleep for %d", duration.count());
cv.wait_for(lock, duration);
startTime = std::chrono::high_resolution_clock::now();
sleep = 0;
switcher->Prune();
if (switcher->stop) {
break;
}
@@ -383,7 +399,6 @@ void SwitcherData::Thread()
case exe_func:
checkExeSwitch(match, scene, transition);
break;
case screen_region_func:
checkScreenRegionSwitch(match, scene,
transition);
@@ -433,6 +448,8 @@ void SwitcherData::Thread()
switchScene(scene, transition,
tansitionOverrideOverride);
}
writeSceneInfoToFile();
}
endLoop:
blog(LOG_INFO, "stopped");