Add option to use transition overrides for transition changes (#164)

* Adjust switchScene() signature to support adjustActiveTransitionType and verbose parameters and only change the transition type if adjustActiveTransitionType, otherwise rely on transition overrides

* Add new adjustActiveTransitionType checkbox

* save and load adjustActiveTransitionType

* Add check to either enable transition type change or use of transition
overrides

* Add locale

* Adjust layout and locale
This commit is contained in:
WarmUpTill
2021-04-10 10:58:17 -07:00
committed by GitHub
parent eb346da6f4
commit e4bf5fa749
8 changed files with 93 additions and 29 deletions

View File

@@ -166,6 +166,7 @@ public slots:
void on_defaultTransitionsUp_clicked();
void on_defaultTransitionsDown_clicked();
void on_transitionOverridecheckBox_stateChanged(int state);
void on_adjustActiveTransitionType_stateChanged(int state);
void defTransitionDelayValueChanged(int value);
void on_browseButton_clicked();
@@ -287,12 +288,14 @@ bool isInFocus(const QString &executable);
void setNextTransition(OBSWeakSource &targetScene, obs_source_t *currentSource,
OBSWeakSource &transition,
bool &transitionOverrideOverride, transitionData &td);
bool transitionOverrideOverride,
bool adjustActiveTransitionType, 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);
bool transitionOverrideOverride,
bool adjustActiveTransitionType, bool verbose);
/******************************************************************************
* Main SwitcherData

View File

@@ -62,6 +62,7 @@ struct SwitcherData {
bool disableHints = false;
bool showFrame = false;
bool tansitionOverrideOverride = false;
bool adjustActiveTransitionType = true;
int interval = default_interval;