add option to allow scene sequence to be interrupted (#93)

This commit is contained in:
WarmUpTill
2021-01-02 14:32:18 +01:00
committed by GitHub
parent 2f0b900745
commit 4e971f59a9
5 changed files with 101 additions and 32 deletions

View File

@@ -15,6 +15,8 @@ struct SceneSequenceSwitch : SceneSwitcherEntry {
OBSWeakSource startScene = nullptr;
double delay = 0;
int delayMultiplier = 1;
bool interruptible = false;
unsigned int matchCount = 0;
const char *getType() { return "sequence"; }
bool initialized();
@@ -25,11 +27,13 @@ struct SceneSequenceSwitch : SceneSwitcherEntry {
inline SceneSequenceSwitch(OBSWeakSource startScene_,
OBSWeakSource scene_,
OBSWeakSource transition_, double delay_,
int delayMultiplier_, bool usePreviousScene_)
int delayMultiplier_, bool interruptible_,
bool usePreviousScene_)
: SceneSwitcherEntry(scene_, transition_, usePreviousScene_),
startScene(startScene_),
delay(delay_),
delayMultiplier(delayMultiplier_)
delayMultiplier(delayMultiplier_),
interruptible(interruptible_)
{
}
};
@@ -50,11 +54,13 @@ private slots:
void DelayChanged(double delay);
void DelayUnitsChanged(int idx);
void StartSceneChanged(const QString &text);
void InterruptibleChanged(int state);
private:
QDoubleSpinBox *delay;
QComboBox *delayUnits;
QComboBox *startScenes;
QCheckBox *interruptible;
SceneSequenceSwitch *switchData;
};