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

Add option to check for OBS shutdown to MacroConditionPluginState

Browse Source
This commit is contained in:
WarmUpTill
2022-02-03 20:43:34 +01:00
committed by WarmUpTill
parent 34167366db
commit b48276bd5c
5 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/headers/macro-condition-plugin-state.hpp
View File

@@ -4,13 +4,15 @@
#include <QComboBox>
enum class PluginStateCondition {
SCENESWITCHED,
SCENE_SWITCHED,
RUNNING,
SHUTDOWN,
};
class MacroConditionPluginState : public MacroCondition {
public:
MacroConditionPluginState(Macro *m) : MacroCondition(m) {}
~MacroConditionPluginState();
bool CheckCondition();
bool Save(obs_data_t *obj);
bool Load(obs_data_t *obj);
@@ -20,7 +22,7 @@ public:
return std::make_shared<MacroConditionPluginState>(m);
}
PluginStateCondition _condition = PluginStateCondition::SCENESWITCHED;
PluginStateCondition _condition = PluginStateCondition::SCENE_SWITCHED;
private:
static bool _registered;

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

@@ -125,6 +125,8 @@ struct SwitcherData {
std::condition_variable macroTransitionCv;
bool macroSceneSwitched = false;
bool replayBufferSaved = false;
bool obsIsShuttingDown = false;
int shutdownConditionCount = 0;
std::deque<WindowSwitch> windowSwitches;
std::vector<std::string> ignoreIdleWindows;