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

Move filter / source functions to utility

Browse Source
This commit is contained in:
WarmUpTill
2021-06-13 21:42:18 +02:00
committed by WarmUpTill
parent a7e03245bd
commit 75f8d0cb07
4 changed files with 90 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/macro-condition-source.cpp
View File

@@ -21,23 +21,6 @@ static std::map<SourceCondition, std::string> sourceConditionTypes = {
"AdvSceneSwitcher.condition.source.type.settings"},
};
bool checkSettings(const OBSWeakSource &source, const std::string &settings,
bool useRegex)
{
bool ret = false;
std::string currentSettings = getSourceSettings(source);
if (useRegex) {
try {
std::regex expr(settings);
ret = std::regex_match(currentSettings, expr);
} catch (const std::regex_error &) {
}
} else {
ret = currentSettings == settings;
}
return ret;
}
bool MacroConditionSource::CheckCondition()
{
if (!_source) {
@@ -55,7 +38,7 @@ bool MacroConditionSource::CheckCondition()
ret = obs_source_showing(s);
break;
case SourceCondition::SETTINGS:
ret = checkSettings(_source, _settings, _regex);
ret = compareSourceSettings(_source, _settings, _regex);
break;
default:
break;