Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-15 13:53:19 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Enable getting variable values from source condition

Browse Source
This commit is contained in:
WarmUpTill
2023-01-14 19:23:30 +01:00
committed by WarmUpTill
parent f1cdab80a9
commit e9f4ac7ca7
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/macro-core/macro-condition-source.cpp
View File

@@ -38,6 +38,10 @@ bool MacroConditionSource::CheckCondition()
case SourceCondition::SETTINGS:
ret = compareSourceSettings(_source.GetSource(), _settings,
_regex);
if (IsReferencedInVars()) {
SetVariableValue(
getSourceSettings(_source.GetSource()));
}
break;
default:
break;
@@ -45,6 +49,10 @@ bool MacroConditionSource::CheckCondition()
obs_source_release(s);
if (GetVariableValue().empty()) {
SetVariableValue(ret ? "true" : "false");
}
return ret;
}

2
src/macro-core/macro-condition-source.hpp
View File

@@ -16,7 +16,7 @@ enum class SourceCondition {
class MacroConditionSource : public MacroCondition {
public:
MacroConditionSource(Macro *m) : MacroCondition(m) {}
MacroConditionSource(Macro *m) : MacroCondition(m, true) {}
bool CheckCondition();
bool Save(obs_data_t *obj) const;
bool Load(obs_data_t *obj);