Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-04-13 21:26:42 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add "previous scene" to the "scene has (not) changed" checks

Browse Source
This commit is contained in:
WarmUpTill 2025-04-10 19:08:07 +02:00 committed by WarmUpTill
parent aaa0113ccb
commit 0fe31432be
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/base/macro-condition-scene.cpp
View File

@ -94,11 +94,15 @@ bool MacroConditionScene::CheckCondition()
SetVariableValue(GetWeakSourceName(GetCurrentScene()));
SetTempVarValue("current",
GetWeakSourceName(GetCurrentScene()));
SetTempVarValue("previous",
GetWeakSourceName(GetPreviousScene()));
return sceneChanged;
case Type::NOT_CHANGED:
SetVariableValue(GetWeakSourceName(GetCurrentScene()));
SetTempVarValue("current",
GetWeakSourceName(GetCurrentScene()));
SetTempVarValue("previous",
GetWeakSourceName(GetPreviousScene()));
return !sceneChanged;
case Type::CURRENT_PATTERN: {
auto scene = getCurrentSceneHelper(_useTransitionTargetScene);
@ -212,8 +216,6 @@ void MacroConditionScene::SetupTempVars()
MacroCondition::SetupTempVars();
switch (_type) {
case Type::CURRENT:
case Type::CHANGED:
case Type::NOT_CHANGED:
case Type::CURRENT_PATTERN:
AddTempvar("current",
obs_module_text(
@ -231,6 +233,15 @@ void MacroConditionScene::SetupTempVars()
obs_module_text(
"AdvSceneSwitcher.tempVar.scene.preview"));
break;
case Type::CHANGED:
case Type::NOT_CHANGED:
AddTempvar("current",
obs_module_text(
"AdvSceneSwitcher.tempVar.scene.current"));
AddTempvar("previous",
obs_module_text(
"AdvSceneSwitcher.tempVar.scene.previous"));
break;
default:
break;
}