Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-03-21 17:34:57 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Enable getting variable values from websocket condition

Browse Source
This commit is contained in:
WarmUpTill 2023-01-16 20:15:39 +01:00 committed by WarmUpTill
parent 828a69bbf7
commit 19eb5074f2
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/macro-core/macro-condition-websocket.cpp
View File

@ -56,14 +56,17 @@ bool MacroConditionWebsocket::CheckCondition()
for (const auto &msg : *messages) {
if (_regex.Enabled()) {
if (matchRegex(_regex, msg, _message)) {
SetVariableValue(msg);
return true;
}
} else {
if (msg == std::string(_message)) {
SetVariableValue(msg);
return true;
}
}
}
SetVariableValue("");
return false;
}

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

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