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

Add option to set transition duration (#171)

Browse Source
This commit is contained in:
WarmUpTill
2021-04-30 15:20:25 -07:00
committed by GitHub
parent 427ed34a1b
commit 041a9e7f19
5 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -291,7 +291,8 @@ void setNextTransition(OBSWeakSource &targetScene, obs_source_t *currentSource,
bool transitionOverrideOverride,
bool adjustActiveTransitionType, transitionData &td);
void overwriteTransitionOverride(obs_weak_source_t *sceneWs,
obs_source_t *transition, transitionData &td);
obs_source_t *transition, int duration,
transitionData &td);
void restoreTransitionOverride(obs_source_t *scene, transitionData td);
void switchScene(OBSWeakSource &scene, OBSWeakSource &transition,
bool transitionOverrideOverride,

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

@@ -1,8 +1,11 @@
#pragma once
#include <QDoubleSpinBox>
#include "switch-generic.hpp"
struct SceneTransition : SceneSwitcherEntry {
OBSWeakSource scene2 = nullptr;
double duration = 0.;
const char *getType() { return "transition"; }
bool initialized();
@@ -10,8 +13,10 @@ struct SceneTransition : SceneSwitcherEntry {
inline SceneTransition(){};
inline SceneTransition(OBSWeakSource scene_, OBSWeakSource scene2_,
OBSWeakSource transition_)
: SceneSwitcherEntry(scene_, transition_), scene2(scene2_)
OBSWeakSource transition_, double duration_)
: SceneSwitcherEntry(scene_, transition_),
scene2(scene2_),
duration(duration_)
{
}
};
@@ -45,9 +50,11 @@ public:
private slots:
void Scene2Changed(const QString &text);
void DurationChanged(double dur);
private:
QComboBox *scenes2;
QDoubleSpinBox *duration;
SceneTransition *switchData;
};