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

add option to override transitionOverrides

Browse Source
This commit is contained in:
WarmUpTill
2020-06-17 22:13:57 +02:00
parent eeefd8279f
commit 340cb559ee
5 changed files with 117 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/headers/advanced-scene-switcher.hpp
View File

@@ -105,6 +105,7 @@ public slots:
void on_defaultTransitions_currentRowChanged(int idx);
void on_defaultTransitionsAdd_clicked();
void on_defaultTransitionsRemove_clicked();
void on_transitionOverridecheckBox_stateChanged(int state);
void on_browseButton_clicked();
void on_readFileCheckBox_stateChanged(int state);
@@ -187,9 +188,20 @@ bool isInFocus(const QString &executable);
struct obs_weak_source;
typedef struct obs_weak_source obs_weak_source_t;
obs_weak_source_t *getNextTransition(obs_weak_source_t *scene1,
obs_weak_source_t *scene2);
typedef struct transitionData {
std::string name = "";
int duration = 0;
} transitionData;
void setNextTransition(OBSWeakSource &targetScene, obs_source_t *currentSource,
OBSWeakSource &transition,
bool &transitionOverrideOverride, transitionData &td);
void overwriteTransitionOverride(obs_weak_source_t *sceneWs,
obs_source_t *transition, transitionData &td);
void restoreTransitionOverride(obs_source_t *scene, transitionData td);
void switchScene(OBSWeakSource &scene, OBSWeakSource &transition,
bool &transitionOverrideOverride,
std::unique_lock<std::mutex> &lock);
/********************************************************************************

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

@@ -270,6 +270,7 @@ struct SwitcherData {
bool startAtLaunch = false;
bool stop = false;
bool verbose = false;
bool tansitionOverrideOverride = false;
int interval = DEFAULT_INTERVAL;