From a81ee605d68d7ca959f241ad6a1000ea18828c6d Mon Sep 17 00:00:00 2001
From: WarmUpTill <WarmUpTill@web.de>
Date: Sun, 30 Jan 2022 22:22:52 +0100
Subject: [PATCH] Rename function

---
 src/headers/macro.hpp         | 4 ++--
 src/macro-action-macro.cpp    | 2 +-
 src/macro-action-random.cpp   | 4 ++--
 src/macro-action-sequence.cpp | 2 +-
 src/macro-tab.cpp             | 2 +-
 src/macro.cpp                 | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/headers/macro.hpp b/src/headers/macro.hpp
index 39dfc1d9..b4ee53f4 100644
--- a/src/headers/macro.hpp
+++ b/src/headers/macro.hpp
@@ -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);
diff --git a/src/macro-action-macro.cpp b/src/macro-action-macro.cpp
index 1b08583c..0a8b0b39 100644
--- a/src/macro-action-macro.cpp
+++ b/src/macro-action-macro.cpp
@@ -36,7 +36,7 @@ bool MacroActionMacro::PerformAction()
 		_macro->ResetCount();
 		break;
 	case PerformMacroAction::RUN:
-		_macro->PerformAction();
+		_macro->PerformActions();
 		break;
 	case PerformMacroAction::STOP:
 		_macro->Stop();
diff --git a/src/macro-action-random.cpp b/src/macro-action-random.cpp
index 0091b55d..05c634d6 100644
--- a/src/macro-action-random.cpp
+++ b/src/macro-action-random.cpp
@@ -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()
diff --git a/src/macro-action-sequence.cpp b/src/macro-action-sequence.cpp
index 2d0bfb75..5597592c 100644
--- a/src/macro-action-sequence.cpp
+++ b/src/macro-action-sequence.cpp
@@ -63,7 +63,7 @@ bool MacroActionSequence::PerformAction()
 		return true;
 	}
 
-	return macro->PerformAction();
+	return macro->PerformActions();
 }
 
 void MacroActionSequence::LogAction()
diff --git a/src/macro-tab.cpp b/src/macro-tab.cpp
index 07b21437..1ff42bb3 100644
--- a/src/macro-tab.cpp
+++ b/src/macro-tab.cpp
@@ -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");
diff --git a/src/macro.cpp b/src/macro.cpp
index 96f305cf..b19c8c5f 100644
--- a/src/macro.cpp
+++ b/src/macro.cpp
@@ -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());
 			}