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

@@ -12,6 +12,7 @@
#include "switch-file.hpp"
#include "switch-idle.hpp"
#include "switch-media.hpp"
#include "switch-pause.hpp"
#include "switch-random.hpp"
#include "switch-screen-region.hpp"
#include "switch-time.hpp"
@@ -73,10 +74,6 @@ struct SwitcherData {
std::deque<ScreenRegionSwitch> screenRegionSwitches;
std::vector<OBSWeakSource> pauseScenesSwitches;
std::vector<std::string> pauseWindowsSwitches;
std::vector<std::string> ignoreWindowsSwitches;
std::deque<SceneSequenceSwitch> sceneSequenceSwitches;
@@ -105,6 +102,8 @@ struct SwitcherData {
std::deque<MediaSwitch> mediaSwitches;
std::deque<PauseEntry> pauseEntries;
std::deque<TimeSwitch> timeSwitches;
QDateTime liveTime;
@@ -207,6 +206,7 @@ struct SwitcherData {
void loadWindowTitleSwitches(obs_data_t *obj);
void loadScreenRegionSwitches(obs_data_t *obj);
void loadPauseSwitches(obs_data_t *obj);
void loadOldPauseSwitches(obs_data_t *obj);
void loadSceneSequenceSwitches(obs_data_t *obj);
void loadSceneTransitions(obs_data_t *obj);
void loadIdleSwitches(obs_data_t *obj);