diff --git a/lib/macro/macro-script-handler.cpp b/lib/macro/macro-script-handler.cpp index 0b7354ec..16ada6a7 100644 --- a/lib/macro/macro-script-handler.cpp +++ b/lib/macro/macro-script-handler.cpp @@ -424,7 +424,7 @@ static std::string signalNameToPropertiesSignalDecl(const std::string &name) static std::string signalNameToCompletionSignalDecl(const std::string &name) { return std::string("bool ") + name + "(in int " + - GeCompletionIdParamName().data() + ")"; + GetCompletionIdParamName().data() + ")"; } ScriptSegmentType::ScriptSegmentType(const std::string &id, diff --git a/lib/macro/macro-script-handler.hpp b/lib/macro/macro-script-handler.hpp index ca66cc50..558466f9 100644 --- a/lib/macro/macro-script-handler.hpp +++ b/lib/macro/macro-script-handler.hpp @@ -46,12 +46,12 @@ static constexpr std::string_view GetActionCompletionSignalParamName() return "completion_signal_name"; } -static constexpr std::string_view GeCompletionIdParamName() +static constexpr std::string_view GetCompletionIdParamName() { return "completion_id"; } -static constexpr std::string_view GeResultSignalParamName() +static constexpr std::string_view GetResultSignalParamName() { return "result"; } diff --git a/lib/macro/macro-segment-script.cpp b/lib/macro/macro-segment-script.cpp index d97ebb07..9cf55c7d 100644 --- a/lib/macro/macro-segment-script.cpp +++ b/lib/macro/macro-segment-script.cpp @@ -85,7 +85,8 @@ bool MacroSegmentScript::SendTriggerSignal() auto data = calldata_create(); calldata_set_string(data, GetActionCompletionSignalParamName().data(), _completionSignal.c_str()); - calldata_set_int(data, GeCompletionIdParamName().data(), _completionId); + calldata_set_int(data, GetCompletionIdParamName().data(), + _completionId); calldata_set_string(data, "settings", obs_data_get_json(GetSettings())); signal_handler_signal(obs_get_signal_handler(), _triggerSignal.c_str(), data); @@ -101,18 +102,18 @@ void MacroSegmentScript::CompletionSignalReceived(void *param, calldata_t *data) { auto segment = static_cast(param); long long int id; - if (!calldata_get_int(data, GeCompletionIdParamName().data(), &id)) { + if (!calldata_get_int(data, GetCompletionIdParamName().data(), &id)) { blog(LOG_WARNING, "received completion signal without \"%s\" parameter", - GeCompletionIdParamName().data()); + GetCompletionIdParamName().data()); return; } bool result; - if (!calldata_get_bool(data, GeResultSignalParamName().data(), + if (!calldata_get_bool(data, GetResultSignalParamName().data(), &result)) { blog(LOG_WARNING, "received completion signal without \"%s\" parameter", - GeResultSignalParamName().data()); + GetResultSignalParamName().data()); return; } if (id != segment->_completionId) { diff --git a/scripting/examples.lua b/scripting/examples.lua index 32fea131..fbba7752 100644 --- a/scripting/examples.lua +++ b/scripting/examples.lua @@ -43,7 +43,7 @@ end ------------------------------------------------------------------------------- --- Action callback demonstrating the interacting with variables +-- Action callback demonstrating the interaction with variables counter = 0 diff --git a/scripting/examples.py b/scripting/examples.py index 6b63192f..06fcffcd 100644 --- a/scripting/examples.py +++ b/scripting/examples.py @@ -35,7 +35,7 @@ def my_python_settings_action(data): ############################################################################### -# Action callback demonstrating the interacting with variables +# Action callback demonstrating the interaction with variables counter = 0