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

Rename function

Browse Source
This commit is contained in:
WarmUpTill 2022-01-30 22:22:52 +01:00 committed by WarmUpTill
parent 1e7726bcfc
commit a81ee605d6
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/headers/macro.hpp
View File

@ -75,8 +75,8 @@ public:
virtual ~Macro();
bool CeckMatch();
bool PerformAction(bool forceParallel = false,
bool ignorePause = false);
bool PerformActions(bool forceParallel = false,
bool ignorePause = false);
bool Matched() { return _matched; }
std::string Name() { return _name; }
void SetName(const std::string &name);

2
src/macro-action-macro.cpp
View File

@ -36,7 +36,7 @@ bool MacroActionMacro::PerformAction()
_macro->ResetCount();
break;
case PerformMacroAction::RUN:
_macro->PerformAction();
_macro->PerformActions();
break;
case PerformMacroAction::STOP:
_macro->Stop();

4
src/macro-action-random.cpp
View File

@ -44,12 +44,12 @@ bool MacroActionRandom::PerformAction()
}
if (macros.size() == 1) {
lastRandomMacro = macros[0];
return macros[0]->PerformAction();
return macros[0]->PerformActions();
}
size_t idx = std::rand() % (macros.size());
lastRandomMacro = macros[idx];
return macros[idx]->PerformAction();
return macros[idx]->PerformActions();
}
void MacroActionRandom::LogAction()

2
src/macro-action-sequence.cpp
View File

@ -63,7 +63,7 @@ bool MacroActionSequence::PerformAction()
return true;
}
return macro->PerformAction();
return macro->PerformActions();
}
void MacroActionSequence::LogAction()

2
src/macro-tab.cpp
View File

@ -199,7 +199,7 @@ void AdvSceneSwitcher::on_runMacro_clicked()
return;
}
bool ret = macro->PerformAction(true, true);
bool ret = macro->PerformActions(true, true);
if (!ret) {
QString err =
obs_module_text("AdvSceneSwitcher.macroTab.runFail");

4
src/macro.cpp
View File

@ -115,7 +115,7 @@ bool Macro::CeckMatch()
return _matched;
}
bool Macro::PerformAction(bool forceParallel, bool ignorePause)
bool Macro::PerformActions(bool forceParallel, bool ignorePause)
{
if (!_done) {
vblog(LOG_INFO, "macro %s already running", _name.c_str());
@ -592,7 +592,7 @@ bool SwitcherData::runMacros()
for (auto m : macros) {
if (m->Matched()) {
vblog(LOG_INFO, "running macro: %s", m->Name().c_str());
if (!m->PerformAction()) {
if (!m->PerformActions()) {
blog(LOG_WARNING, "abort macro: %s",
m->Name().c_str());
}