diff --git a/lib/macro/macro-helpers.cpp b/lib/macro/macro-helpers.cpp index 2d6fa213..2edb5818 100644 --- a/lib/macro/macro-helpers.cpp +++ b/lib/macro/macro-helpers.cpp @@ -63,6 +63,33 @@ std::deque> GetAllMacros() return macros; } +Macro *GetMacroByName(const char *name) +{ + for (const auto &m : GetTopLevelMacros()) { + if (m->Name() == name) { + return m.get(); + } + } + + return nullptr; +} + +Macro *GetMacroByQString(const QString &name) +{ + return GetMacroByName(name.toUtf8().constData()); +} + +std::weak_ptr GetWeakMacroByName(const char *name) +{ + for (const auto &m : GetTopLevelMacros()) { + if (m->Name() == name) { + return m; + } + } + + return {}; +} + std::optional>> GetMacroActions(Macro *macro) { diff --git a/lib/macro/macro-helpers.hpp b/lib/macro/macro-helpers.hpp index b53e0f57..cc61d2f7 100644 --- a/lib/macro/macro-helpers.hpp +++ b/lib/macro/macro-helpers.hpp @@ -1,6 +1,8 @@ #pragma once #include "export-symbol-helper.hpp" +#include + #include #include #include @@ -22,6 +24,10 @@ EXPORT std::deque> &GetTopLevelMacros(); std::deque> &GetTemporaryMacros(); EXPORT std::deque> GetAllMacros(); +Macro *GetMacroByName(const char *name); +Macro *GetMacroByQString(const QString &name); +std::weak_ptr GetWeakMacroByName(const char *name); + EXPORT std::optional>> GetMacroActions(Macro *); EXPORT std::optional>> diff --git a/lib/macro/macro.cpp b/lib/macro/macro.cpp index c828b39a..e3f07044 100644 --- a/lib/macro/macro.cpp +++ b/lib/macro/macro.cpp @@ -1255,33 +1255,6 @@ void StopAllMacros() } } -Macro *GetMacroByName(const char *name) -{ - for (const auto &m : GetTopLevelMacros()) { - if (m->Name() == name) { - return m.get(); - } - } - - return nullptr; -} - -Macro *GetMacroByQString(const QString &name) -{ - return GetMacroByName(name.toUtf8().constData()); -} - -std::weak_ptr GetWeakMacroByName(const char *name) -{ - for (const auto &m : GetTopLevelMacros()) { - if (m->Name() == name) { - return m; - } - } - - return {}; -} - void InvalidateMacroTempVarValues() { for (const auto &m : GetTopLevelMacros()) { diff --git a/lib/macro/macro.hpp b/lib/macro/macro.hpp index 6b9b5db7..d3dc04bf 100644 --- a/lib/macro/macro.hpp +++ b/lib/macro/macro.hpp @@ -9,8 +9,6 @@ #include "temp-variable.hpp" #include -#include -#include #include #include #include @@ -220,9 +218,6 @@ void SaveMacros(obs_data_t *obj); bool CheckMacros(); bool RunMacros(); void StopAllMacros(); -Macro *GetMacroByName(const char *name); -Macro *GetMacroByQString(const QString &name); -std::weak_ptr GetWeakMacroByName(const char *name); void InvalidateMacroTempVarValues(); std::shared_ptr GetMacroWithInvalidConditionInterval();