allow pause individual switching methods (#90)

* allow pausing individual switching methods

* clean up pause tab

* allow import of old pauseScenes and pauseWindows
This commit is contained in:
WarmUpTill
2020-12-31 14:24:09 +01:00
committed by GitHub
parent fae50024ea
commit caa2833272
32 changed files with 520 additions and 357 deletions

View File

@@ -1,6 +1,8 @@
#include "headers/advanced-scene-switcher.hpp"
#include "headers/utility.hpp"
bool DefaultSceneTransition::pause = false;
void AdvSceneSwitcher::on_transitionsAdd_clicked()
{
std::lock_guard<std::mutex> lock(switcher->m);
@@ -138,7 +140,7 @@ void AdvSceneSwitcher::on_defaultTransitionsDown_clicked()
void SwitcherData::checkDefaultSceneTransitions(bool &match,
OBSWeakSource &transition)
{
if (checkedDefTransition)
if (checkedDefTransition || DefaultSceneTransition::pause)
return;
obs_source_t *currentSource = obs_frontend_get_current_scene();