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

Delay setting of default scene transitions (#116)

Browse Source
This commit is contained in:
WarmUpTill
2021-02-06 18:23:41 +01:00
committed by GitHub
parent 81d91a9139
commit c31d1cd975
4 changed files with 52 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/headers/switch-transitions.hpp
View File

@@ -20,6 +20,8 @@ struct DefaultSceneTransition : SceneSwitcherEntry {
static bool pause;
const char *getType() { return "def_transition"; }
bool checkMatch(OBSWeakSource currentScene);
void setTransition();
inline DefaultSceneTransition(){};
inline DefaultSceneTransition(OBSWeakSource scene_,

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

@@ -100,7 +100,6 @@ struct SwitcherData {
std::deque<SceneTransition> sceneTransitions;
std::deque<DefaultSceneTransition> defaultSceneTransitions;
bool checkedDefTransition = false;
std::deque<MediaSwitch> mediaSwitches;
@@ -164,9 +163,7 @@ struct SwitcherData {
void writeSceneInfoToFile();
void writeToStatusFile(QString status);
bool checkPause();
void checkDefaultSceneTransitions(bool &match,
OBSWeakSource &transition);
void setCurrentDefTransition(OBSWeakSource &transition);
void checkDefaultSceneTransitions();
void checkSceneSequence(bool &match, OBSWeakSource &scene,
OBSWeakSource &transition, int &linger);
void checkIdleSwitch(bool &match, OBSWeakSource &scene,