From 98d1f83accdbfcb3b1df201f9655c2c5af8d1d2f Mon Sep 17 00:00:00 2001 From: WarmUpTill <19472752+WarmUpTill@users.noreply.github.com> Date: Sun, 15 Jun 2025 14:16:57 +0200 Subject: [PATCH] Cleanup --- lib/macro/macro-action-queue.cpp | 18 +--- lib/macro/macro-condition-macro.cpp | 60 +++---------- lib/macro/macro-condition-queue.cpp | 18 +--- lib/macro/macro-condition-tempvar.cpp | 37 ++------ lib/macro/macro-condition-variable.cpp | 37 ++------ plugins/base/macro-action-audio.cpp | 90 ++++--------------- plugins/base/macro-action-clipboard.cpp | 18 +--- plugins/base/macro-action-file.cpp | 18 +--- plugins/base/macro-action-hotkey.cpp | 83 +++-------------- plugins/base/macro-action-http-legacy.cpp | 36 ++------ plugins/base/macro-action-log.cpp | 6 +- plugins/base/macro-action-media.cpp | 42 ++------- plugins/base/macro-action-osc.cpp | 24 +---- plugins/base/macro-action-plugin-state.cpp | 24 +---- plugins/base/macro-action-random.cpp | 24 +---- plugins/base/macro-action-recording.cpp | 18 +--- .../base/macro-action-scene-collection.cpp | 6 +- plugins/base/macro-action-scene-lock.cpp | 18 +--- plugins/base/macro-action-scene-switch.cpp | 30 ++----- .../base/macro-action-scene-visibility.cpp | 18 +--- plugins/base/macro-action-sequence.cpp | 50 ++--------- plugins/base/macro-action-source.cpp | 6 +- plugins/base/macro-action-streaming.cpp | 17 +--- plugins/base/macro-action-studio-mode.cpp | 12 +-- plugins/base/macro-action-systray.cpp | 6 +- plugins/base/macro-action-timer.cpp | 18 +--- plugins/base/macro-action-transition.cpp | 42 ++------- plugins/base/macro-action-virtual-cam.cpp | 6 +- plugins/base/macro-action-wait.cpp | 18 +--- plugins/base/macro-action-websocket.cpp | 24 +---- plugins/base/macro-condition-audio.cpp | 46 ++-------- plugins/base/macro-condition-clipboard.cpp | 18 +--- plugins/base/macro-condition-cursor.cpp | 36 ++------ plugins/base/macro-condition-date.cpp | 71 +++------------ plugins/base/macro-condition-display.cpp | 48 ++-------- plugins/base/macro-condition-file.cpp | 36 ++------ plugins/base/macro-condition-filter.cpp | 36 ++------ plugins/base/macro-condition-folder.cpp | 30 ++----- plugins/base/macro-condition-hotkey.cpp | 12 +-- plugins/base/macro-condition-idle.cpp | 6 +- plugins/base/macro-condition-media.cpp | 6 +- plugins/base/macro-condition-plugin-state.cpp | 6 +- plugins/base/macro-condition-recording.cpp | 12 +-- .../base/macro-condition-replay-buffer.cpp | 6 +- plugins/base/macro-condition-run.cpp | 24 +---- plugins/base/macro-condition-scene-order.cpp | 29 ++---- .../base/macro-condition-scene-visibility.cpp | 18 +--- plugins/base/macro-condition-source.cpp | 42 ++------- plugins/base/macro-condition-studio-mode.cpp | 12 +-- plugins/base/macro-condition-timer.cpp | 42 ++------- plugins/base/macro-condition-transition.cpp | 24 +---- plugins/base/macro-condition-virtual-cam.cpp | 6 +- plugins/midi/macro-action-midi.cpp | 12 +-- plugins/openvr/macro-condition-openvr.cpp | 36 ++------ 54 files changed, 241 insertions(+), 1197 deletions(-) diff --git a/lib/macro/macro-action-queue.cpp b/lib/macro/macro-action-queue.cpp index 67faf6e6..35feb397 100644 --- a/lib/macro/macro-action-queue.cpp +++ b/lib/macro/macro-action-queue.cpp @@ -170,11 +170,7 @@ void MacroActionQueueEdit::UpdateEntryData() void MacroActionQueueEdit::MacroChanged(const QString &text) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_macro = text; emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -182,11 +178,7 @@ void MacroActionQueueEdit::MacroChanged(const QString &text) void MacroActionQueueEdit::QueueChanged(const QString &text) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_queue = GetWeakActionQueueByQString(text); emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -194,11 +186,7 @@ void MacroActionQueueEdit::QueueChanged(const QString &text) void MacroActionQueueEdit::ActionChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_action = static_cast(value); SetWidgetVisibility(); emit HeaderInfoChanged( diff --git a/lib/macro/macro-condition-macro.cpp b/lib/macro/macro-condition-macro.cpp index 2a1a3373..2d432478 100644 --- a/lib/macro/macro-condition-macro.cpp +++ b/lib/macro/macro-condition-macro.cpp @@ -538,11 +538,7 @@ void MacroConditionMacroEdit::UpdateEntryData() void MacroConditionMacroEdit::MacroChanged(const QString &text) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_macro = text; _actionIndex->SetMacro(_entryData->_macro.GetMacro()); emit HeaderInfoChanged( @@ -551,21 +547,13 @@ void MacroConditionMacroEdit::MacroChanged(const QString &text) void MacroConditionMacroEdit::CountChanged(const NumberVariable &value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_count = value; } void MacroConditionMacroEdit::CountConditionChanged(int cond) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_counterCondition = static_cast(cond); } @@ -590,11 +578,7 @@ void MacroConditionMacroEdit::MacroRemove(const QString &) void MacroConditionMacroEdit::TypeChanged(int type) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->SetType(static_cast(type)); SetupWidgets(); } @@ -640,11 +624,7 @@ void MacroConditionMacroEdit::UpdatePaused() void MacroConditionMacroEdit::MultiStateConditionChanged(int cond) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_multiSateCondition = static_cast(cond); } @@ -652,21 +632,13 @@ void MacroConditionMacroEdit::MultiStateConditionChanged(int cond) void MacroConditionMacroEdit::MultiStateCountChanged( const NumberVariable &value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_multiSateCount = value; } void MacroConditionMacroEdit::Add(const std::string &name) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); MacroRef macro(name); _entryData->_macros.push_back(macro); adjustSize(); @@ -675,11 +647,7 @@ void MacroConditionMacroEdit::Add(const std::string &name) void MacroConditionMacroEdit::Remove(int idx) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_macros.erase(std::next(_entryData->_macros.begin(), idx)); adjustSize(); updateGeometry(); @@ -687,12 +655,8 @@ void MacroConditionMacroEdit::Remove(int idx) void MacroConditionMacroEdit::Replace(int idx, const std::string &name) { - if (_loading || !_entryData) { - return; - } - + GUARD_LOADING_AND_LOCK(); MacroRef macro(name); - auto lock = LockContext(); _entryData->_macros[idx] = macro; adjustSize(); updateGeometry(); @@ -700,11 +664,7 @@ void MacroConditionMacroEdit::Replace(int idx, const std::string &name) void MacroConditionMacroEdit::ActionIndexChanged(const IntVariable &value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_actionIndex = value; } diff --git a/lib/macro/macro-condition-queue.cpp b/lib/macro/macro-condition-queue.cpp index ac8e5290..6ee01e56 100644 --- a/lib/macro/macro-condition-queue.cpp +++ b/lib/macro/macro-condition-queue.cpp @@ -115,11 +115,7 @@ MacroConditionQueueEdit::MacroConditionQueueEdit( void MacroConditionQueueEdit::ConditionChanged(int condition) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_condition = static_cast(condition); emit HeaderInfoChanged( @@ -129,11 +125,7 @@ void MacroConditionQueueEdit::ConditionChanged(int condition) void MacroConditionQueueEdit::QueueChanged(const QString &text) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_queue = GetWeakActionQueueByQString(text); emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -141,11 +133,7 @@ void MacroConditionQueueEdit::QueueChanged(const QString &text) void MacroConditionQueueEdit::SizeChanged(const NumberVariable &value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_size = value; } diff --git a/lib/macro/macro-condition-tempvar.cpp b/lib/macro/macro-condition-tempvar.cpp index 14435fa1..e3077141 100644 --- a/lib/macro/macro-condition-tempvar.cpp +++ b/lib/macro/macro-condition-tempvar.cpp @@ -264,32 +264,19 @@ void MacroConditionTempVarEdit::UpdateEntryData() void MacroConditionTempVarEdit::VariableChanged(const TempVariableRef &var) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_tempVar = var; } void MacroConditionTempVarEdit::Variable2Changed(const QString &text) { - - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_variable2 = GetWeakVariableByQString(text); } void MacroConditionTempVarEdit::ConditionChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_type = static_cast(value); SetWidgetVisibility(); @@ -297,11 +284,7 @@ void MacroConditionTempVarEdit::ConditionChanged(int value) void MacroConditionTempVarEdit::StrValueChanged() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_strValue = _strValue->toPlainText().toStdString(); adjustSize(); updateGeometry(); @@ -309,21 +292,13 @@ void MacroConditionTempVarEdit::StrValueChanged() void MacroConditionTempVarEdit::NumValueChanged(double val) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_numValue = val; } void MacroConditionTempVarEdit::RegexChanged(const RegexConfig &conf) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_regex = conf; adjustSize(); updateGeometry(); diff --git a/lib/macro/macro-condition-variable.cpp b/lib/macro/macro-condition-variable.cpp index 0f1ea5bd..54b84c09 100644 --- a/lib/macro/macro-condition-variable.cpp +++ b/lib/macro/macro-condition-variable.cpp @@ -236,11 +236,7 @@ void MacroConditionVariableEdit::UpdateEntryData() void MacroConditionVariableEdit::VariableChanged(const QString &text) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_variable = GetWeakVariableByQString(text); emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -248,22 +244,13 @@ void MacroConditionVariableEdit::VariableChanged(const QString &text) void MacroConditionVariableEdit::Variable2Changed(const QString &text) { - - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_variable2 = GetWeakVariableByQString(text); } void MacroConditionVariableEdit::ConditionChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_type = static_cast(value); SetWidgetVisibility(); @@ -271,11 +258,7 @@ void MacroConditionVariableEdit::ConditionChanged(int value) void MacroConditionVariableEdit::StrValueChanged() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_strValue = _strValue->toPlainText().toStdString(); adjustSize(); updateGeometry(); @@ -283,21 +266,13 @@ void MacroConditionVariableEdit::StrValueChanged() void MacroConditionVariableEdit::NumValueChanged(double val) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_numValue = val; } void MacroConditionVariableEdit::RegexChanged(const RegexConfig &conf) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_regex = conf; adjustSize(); updateGeometry(); diff --git a/plugins/base/macro-action-audio.cpp b/plugins/base/macro-action-audio.cpp index 3d021cc5..db02dd6b 100644 --- a/plugins/base/macro-action-audio.cpp +++ b/plugins/base/macro-action-audio.cpp @@ -666,11 +666,7 @@ void MacroActionAudioEdit::UpdateEntryData() void MacroActionAudioEdit::SourceChanged(const SourceSelection &source) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_audioSource = source; emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -678,11 +674,7 @@ void MacroActionAudioEdit::SourceChanged(const SourceSelection &source) void MacroActionAudioEdit::ActionChanged(int idx) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_action = static_cast( _actions->itemData(idx).toInt()); SetWidgetVisibility(); @@ -690,133 +682,81 @@ void MacroActionAudioEdit::ActionChanged(int idx) void MacroActionAudioEdit::SyncOffsetChanged(const NumberVariable &value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_syncOffset = value; } void MacroActionAudioEdit::MonitorTypeChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_monitorType = static_cast(value); } void MacroActionAudioEdit::BalanceChanged(const NumberVariable &value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_balance = value; } void MacroActionAudioEdit::TrackChanged(const NumberVariable &value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_track = value; } void MacroActionAudioEdit::VolumeDBChanged(const NumberVariable &value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_volumeDB = value; } void MacroActionAudioEdit::PercentDBClicked() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_useDb = !_entryData->_useDb; SetWidgetVisibility(); } void MacroActionAudioEdit::VolumeChanged(const NumberVariable &value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_volume = value; } void MacroActionAudioEdit::FadeChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_fade = value; SetWidgetVisibility(); } void MacroActionAudioEdit::DurationChanged(const Duration &dur) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_duration = dur; } void MacroActionAudioEdit::RateChanged(const NumberVariable &value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_rate = value; } void MacroActionAudioEdit::WaitChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_wait = value; } void MacroActionAudioEdit::AbortActiveFadeChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_abortActiveFade = value; } void MacroActionAudioEdit::FadeTypeChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_fadeType = static_cast(value); SetWidgetVisibility(); } diff --git a/plugins/base/macro-action-clipboard.cpp b/plugins/base/macro-action-clipboard.cpp index 606f2423..bad5cd47 100644 --- a/plugins/base/macro-action-clipboard.cpp +++ b/plugins/base/macro-action-clipboard.cpp @@ -214,11 +214,7 @@ MacroActionClipboardEdit::MacroActionClipboardEdit( void MacroActionClipboardEdit::ActionChanged(int index) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_action = static_cast( _actions->itemData(index).toInt()); @@ -227,21 +223,13 @@ void MacroActionClipboardEdit::ActionChanged(int index) void MacroActionClipboardEdit::TextChanged() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_text = _text->text().toStdString(); } void MacroActionClipboardEdit::UrlChanged() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_url = _url->text().toStdString(); } diff --git a/plugins/base/macro-action-file.cpp b/plugins/base/macro-action-file.cpp index d8e0b815..79f58306 100644 --- a/plugins/base/macro-action-file.cpp +++ b/plugins/base/macro-action-file.cpp @@ -153,11 +153,7 @@ void MacroActionFileEdit::UpdateEntryData() void MacroActionFileEdit::PathChanged(const QString &text) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_file = text.toUtf8().constData(); emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -165,11 +161,7 @@ void MacroActionFileEdit::PathChanged(const QString &text) void MacroActionFileEdit::TextChanged() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_text = _text->toPlainText().toStdString(); adjustSize(); @@ -178,11 +170,7 @@ void MacroActionFileEdit::TextChanged() void MacroActionFileEdit::ActionChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_action = static_cast(value); } diff --git a/plugins/base/macro-action-hotkey.cpp b/plugins/base/macro-action-hotkey.cpp index 0baebc7d..4894e4f5 100644 --- a/plugins/base/macro-action-hotkey.cpp +++ b/plugins/base/macro-action-hotkey.cpp @@ -788,133 +788,82 @@ void MacroActionHotkeyEdit::UpdateEntryData() void MacroActionHotkeyEdit::LShiftChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_leftShift = state; } void MacroActionHotkeyEdit::RShiftChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_rightShift = state; } void MacroActionHotkeyEdit::LCtrlChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_leftCtrl = state; } void MacroActionHotkeyEdit::RCtrlChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_rightCtrl = state; } void MacroActionHotkeyEdit::LAltChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_leftAlt = state; } void MacroActionHotkeyEdit::RAltChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_rightAlt = state; } void MacroActionHotkeyEdit::LMetaChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_leftMeta = state; } void MacroActionHotkeyEdit::RMetaChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_rightMeta = state; } void MacroActionHotkeyEdit::DurationChanged(const Duration &dur) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_duration = dur; } void MacroActionHotkeyEdit::OnlySendToOBSChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_onlySendToObs = state; SetWidgetVisibility(); } void MacroActionHotkeyEdit::KeyChanged(int key) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_key = static_cast(key); } void MacroActionHotkeyEdit::ActionChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_action = static_cast(value); SetWidgetVisibility(); } void MacroActionHotkeyEdit::HotkeyTypeChanged(int value) { - if (_loading || !_entryData) { - return; - } { - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_hotkeyType = static_cast(value); } @@ -923,11 +872,7 @@ void MacroActionHotkeyEdit::HotkeyTypeChanged(int value) void MacroActionHotkeyEdit::OBSHotkeyChanged(int idx) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); if (idx == -1) { _entryData->_hotkeyName = ""; return; diff --git a/plugins/base/macro-action-http-legacy.cpp b/plugins/base/macro-action-http-legacy.cpp index 9b62b503..5754274c 100644 --- a/plugins/base/macro-action-http-legacy.cpp +++ b/plugins/base/macro-action-http-legacy.cpp @@ -238,54 +238,34 @@ void MacroActionHttpEdit::UpdateEntryData() void MacroActionHttpEdit::URLChanged() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_url = _url->text().toStdString(); emit(HeaderInfoChanged(_url->text())); } void MacroActionHttpEdit::MethodChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_method = static_cast(value); SetWidgetVisibility(); } void MacroActionHttpEdit::TimeoutChanged(const Duration &dur) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_timeout = dur; } void MacroActionHttpEdit::SetHeadersChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_setHeaders = value; SetWidgetVisibility(); } void MacroActionHttpEdit::HeadersChanged(const StringList &headers) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_headers = headers; adjustSize(); updateGeometry(); @@ -302,11 +282,7 @@ void MacroActionHttpEdit::SetWidgetVisibility() void MacroActionHttpEdit::DataChanged() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_data = _data->toPlainText().toUtf8().constData(); adjustSize(); diff --git a/plugins/base/macro-action-log.cpp b/plugins/base/macro-action-log.cpp index 00ba3a5c..1f13be1d 100644 --- a/plugins/base/macro-action-log.cpp +++ b/plugins/base/macro-action-log.cpp @@ -75,11 +75,7 @@ void MacroActionLogEdit::UpdateEntryData() void MacroActionLogEdit::LogMessageChanged() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_logMessage = _logMessage->toPlainText().toStdString(); adjustSize(); diff --git a/plugins/base/macro-action-media.cpp b/plugins/base/macro-action-media.cpp index 593040d0..4d12f1a4 100644 --- a/plugins/base/macro-action-media.cpp +++ b/plugins/base/macro-action-media.cpp @@ -286,22 +286,14 @@ MacroActionMediaEdit::MacroActionMediaEdit( void MacroActionMediaEdit::ActionChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_action = static_cast(value); SetWidgetVisibility(); } void MacroActionMediaEdit::SelectionTypeChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_selection = static_cast(value); SetWidgetVisibility(); @@ -309,32 +301,20 @@ void MacroActionMediaEdit::SelectionTypeChanged(int value) void MacroActionMediaEdit::SeekDurationChanged(const Duration &seekDuration) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_seekDuration = seekDuration; } void MacroActionMediaEdit::SeekPercentageChanged( const NumberVariable &seekPercentage) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_seekPercentage = seekPercentage; } void MacroActionMediaEdit::SourceChanged(const SourceSelection &source) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_mediaSource = source; emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -342,11 +322,7 @@ void MacroActionMediaEdit::SourceChanged(const SourceSelection &source) void MacroActionMediaEdit::SourceChanged(const SceneItemSelection &item) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_sceneItem = item; emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -356,11 +332,7 @@ void MacroActionMediaEdit::SourceChanged(const SceneItemSelection &item) void MacroActionMediaEdit::SceneChanged(const SceneSelection &scene) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_scene = scene; emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); diff --git a/plugins/base/macro-action-osc.cpp b/plugins/base/macro-action-osc.cpp index 43b8f90b..b46e67d4 100644 --- a/plugins/base/macro-action-osc.cpp +++ b/plugins/base/macro-action-osc.cpp @@ -296,41 +296,25 @@ void MacroActionOSCEdit::UpdateEntryData() void MacroActionOSCEdit::IpChanged() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->SetIP(_ip->text().toStdString()); } void MacroActionOSCEdit::ProtocolChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->SetProtocol(static_cast(value)); } void MacroActionOSCEdit::PortChanged(const NumberVariable &value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->SetPortNr(value); } void MacroActionOSCEdit::MessageChanged(const OSCMessage &m) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_message = m; adjustSize(); diff --git a/plugins/base/macro-action-plugin-state.cpp b/plugins/base/macro-action-plugin-state.cpp index 91fa8f69..e1f680ef 100644 --- a/plugins/base/macro-action-plugin-state.cpp +++ b/plugins/base/macro-action-plugin-state.cpp @@ -300,12 +300,8 @@ void MacroActionPluginStateEdit::UpdateEntryData() void MacroActionPluginStateEdit::ActionChanged(int value) { - if (_loading || !_entryData) { - return; - } - { - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_action = static_cast(value); SetWidgetVisibility(); } @@ -316,32 +312,20 @@ void MacroActionPluginStateEdit::ActionChanged(int value) void MacroActionPluginStateEdit::ValueChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_value = value; SetWidgetVisibility(); } void MacroActionPluginStateEdit::SceneChanged(const QString &text) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_scene = GetWeakSourceByQString(text); } void MacroActionPluginStateEdit::PathChanged(const QString &text) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_settingsPath = text.toStdString(); } diff --git a/plugins/base/macro-action-random.cpp b/plugins/base/macro-action-random.cpp index 3408ed98..15ca3e74 100644 --- a/plugins/base/macro-action-random.cpp +++ b/plugins/base/macro-action-random.cpp @@ -157,11 +157,7 @@ void MacroActionRandomEdit::MacroRemove(const QString &) void MacroActionRandomEdit::Add(const std::string &name) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); MacroRef macro(name); _entryData->_macros.push_back(macro); _allowRepeat->setVisible(ShouldShowAllowRepeat()); @@ -170,11 +166,7 @@ void MacroActionRandomEdit::Add(const std::string &name) void MacroActionRandomEdit::Remove(int idx) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_macros.erase(std::next(_entryData->_macros.begin(), idx)); _allowRepeat->setVisible(ShouldShowAllowRepeat()); adjustSize(); @@ -182,23 +174,15 @@ void MacroActionRandomEdit::Remove(int idx) void MacroActionRandomEdit::Replace(int idx, const std::string &name) { - if (_loading || !_entryData) { - return; - } - + GUARD_LOADING_AND_LOCK(); MacroRef macro(name); - auto lock = LockContext(); _entryData->_macros[idx] = macro; adjustSize(); } void MacroActionRandomEdit::AllowRepeatChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_allowRepeat = value; } diff --git a/plugins/base/macro-action-recording.cpp b/plugins/base/macro-action-recording.cpp index 0feec5d3..f69a0ee5 100644 --- a/plugins/base/macro-action-recording.cpp +++ b/plugins/base/macro-action-recording.cpp @@ -199,21 +199,13 @@ static bool isPauseAction(MacroActionRecord::Action a) void MacroActionRecordEdit::FolderChanged(const QString &folder) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_folder = folder.toStdString(); } void MacroActionRecordEdit::FormatStringChanged() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_fileFormat = _recordFileFormat->text().toStdString(); } @@ -230,11 +222,7 @@ void MacroActionRecordEdit::SetWidgetVisibility() void MacroActionRecordEdit::ActionChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_action = static_cast(value); SetWidgetVisibility(); } diff --git a/plugins/base/macro-action-scene-collection.cpp b/plugins/base/macro-action-scene-collection.cpp index 1530db18..d3f3a652 100644 --- a/plugins/base/macro-action-scene-collection.cpp +++ b/plugins/base/macro-action-scene-collection.cpp @@ -121,11 +121,7 @@ void MacroActionSceneCollectionEdit::UpdateEntryData() void MacroActionSceneCollectionEdit::SceneCollectionChanged(const QString &text) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_sceneCollection = text.toStdString(); emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); diff --git a/plugins/base/macro-action-scene-lock.cpp b/plugins/base/macro-action-scene-lock.cpp index 1d002828..069f0d2b 100644 --- a/plugins/base/macro-action-scene-lock.cpp +++ b/plugins/base/macro-action-scene-lock.cpp @@ -156,21 +156,13 @@ void MacroActionSceneLockEdit::UpdateEntryData() void MacroActionSceneLockEdit::SceneChanged(const SceneSelection &s) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_scene = s; } void MacroActionSceneLockEdit::SourceChanged(const SceneItemSelection &item) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_source = item; emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -180,11 +172,7 @@ void MacroActionSceneLockEdit::SourceChanged(const SceneItemSelection &item) void MacroActionSceneLockEdit::ActionChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_action = static_cast(value); } diff --git a/plugins/base/macro-action-scene-switch.cpp b/plugins/base/macro-action-scene-switch.cpp index bbddb0a1..f5f81a9b 100644 --- a/plugins/base/macro-action-scene-switch.cpp +++ b/plugins/base/macro-action-scene-switch.cpp @@ -273,31 +273,19 @@ MacroActionSwitchSceneEdit::MacroActionSwitchSceneEdit( void MacroActionSwitchSceneEdit::DurationChanged(const Duration &dur) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_duration = dur; } void MacroActionSwitchSceneEdit::BlockUntilTransitionDoneChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_blockUntilTransitionDone = state; } void MacroActionSwitchSceneEdit::SceneTypeChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_sceneType = static_cast(value); SetWidgetVisibility(); @@ -351,11 +339,7 @@ void MacroActionSwitchSceneEdit::SetWidgetVisibility() void MacroActionSwitchSceneEdit::SceneChanged(const SceneSelection &s) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_scene = s; emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -363,11 +347,7 @@ void MacroActionSwitchSceneEdit::SceneChanged(const SceneSelection &s) void MacroActionSwitchSceneEdit::TransitionChanged(const TransitionSelection &t) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_transition = t; SetWidgetVisibility(); } diff --git a/plugins/base/macro-action-scene-visibility.cpp b/plugins/base/macro-action-scene-visibility.cpp index 0a6b57bf..4860a37e 100644 --- a/plugins/base/macro-action-scene-visibility.cpp +++ b/plugins/base/macro-action-scene-visibility.cpp @@ -170,22 +170,14 @@ void MacroActionSceneVisibilityEdit::UpdateEntryData() void MacroActionSceneVisibilityEdit::SceneChanged(const SceneSelection &s) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_scene = s; } void MacroActionSceneVisibilityEdit::SourceChanged( const SceneItemSelection &item) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_source = item; emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -195,11 +187,7 @@ void MacroActionSceneVisibilityEdit::SourceChanged( void MacroActionSceneVisibilityEdit::ActionChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_action = static_cast(value); } diff --git a/plugins/base/macro-action-sequence.cpp b/plugins/base/macro-action-sequence.cpp index d98b57a0..044f91fb 100644 --- a/plugins/base/macro-action-sequence.cpp +++ b/plugins/base/macro-action-sequence.cpp @@ -279,11 +279,7 @@ void MacroActionSequenceEdit::MacroRemove(const QString &) void MacroActionSequenceEdit::Add(const std::string &name) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); MacroRef macro(name); _entryData->_macros.push_back(macro); adjustSize(); @@ -291,39 +287,27 @@ void MacroActionSequenceEdit::Add(const std::string &name) void MacroActionSequenceEdit::Remove(int idx) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_macros.erase(std::next(_entryData->_macros.begin(), idx)); adjustSize(); } void MacroActionSequenceEdit::Up(int idx) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); std::swap(_entryData->_macros[idx], _entryData->_macros[idx - 1]); } void MacroActionSequenceEdit::Down(int idx) { - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); std::swap(_entryData->_macros[idx], _entryData->_macros[idx + 1]); } void MacroActionSequenceEdit::Replace(int idx, const std::string &name) { - if (_loading || !_entryData) { - return; - } - + GUARD_LOADING_AND_LOCK(); MacroRef macro(name); - auto lock = LockContext(); _entryData->_macros[idx] = macro; adjustSize(); } @@ -344,11 +328,7 @@ void MacroActionSequenceEdit::ContinueFromClicked() void MacroActionSequenceEdit::RestartChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_restart = state; } @@ -377,32 +357,20 @@ void MacroActionSequenceEdit::UpdateStatusLine() void MacroActionSequenceEdit::ActionChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_action = static_cast(value); SetWidgetVisibility(); } void MacroActionSequenceEdit::MacroChanged(const QString &text) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_macro = text; } void MacroActionSequenceEdit::ResetIndexChanged(const NumberVariable &value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_resetIndex = value; } diff --git a/plugins/base/macro-action-source.cpp b/plugins/base/macro-action-source.cpp index 187e9fc1..a3abd4f1 100644 --- a/plugins/base/macro-action-source.cpp +++ b/plugins/base/macro-action-source.cpp @@ -405,12 +405,8 @@ void MacroActionSourceEdit::UpdateEntryData() void MacroActionSourceEdit::SourceChanged(const SourceSelection &source) { - if (_loading || !_entryData) { - return; - } - { - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_source = source; } diff --git a/plugins/base/macro-action-streaming.cpp b/plugins/base/macro-action-streaming.cpp index 4500427b..e0bf6efe 100644 --- a/plugins/base/macro-action-streaming.cpp +++ b/plugins/base/macro-action-streaming.cpp @@ -236,21 +236,13 @@ void MacroActionStreamEdit::UpdateEntryData() void MacroActionStreamEdit::KeyFrameIntervalChanged( const NumberVariable &value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_keyFrameInterval = value; } void MacroActionStreamEdit::StringValueChanged() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_stringValue = _stringValue->text().toStdString(); SetWidgetVisibility(); } @@ -303,11 +295,8 @@ void MacroActionStreamEdit::SetWidgetVisibility() void MacroActionStreamEdit::ActionChanged(int value) { - if (_loading || !_entryData) { - return; - } { - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_action = static_cast(value); } diff --git a/plugins/base/macro-action-studio-mode.cpp b/plugins/base/macro-action-studio-mode.cpp index 2289b247..bdb2a2d7 100644 --- a/plugins/base/macro-action-studio-mode.cpp +++ b/plugins/base/macro-action-studio-mode.cpp @@ -164,11 +164,7 @@ void MacroActionSudioModeEdit::UpdateEntryData() void MacroActionSudioModeEdit::SceneChanged(const SceneSelection &s) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_scene = s; emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -187,11 +183,7 @@ void MacroActionSudioModeEdit::SetWidgetVisibility() void MacroActionSudioModeEdit::ActionChanged(int index) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_action = static_cast( _actions->itemData(index).toInt()); SetWidgetVisibility(); diff --git a/plugins/base/macro-action-systray.cpp b/plugins/base/macro-action-systray.cpp index afb96069..cf9e81de 100644 --- a/plugins/base/macro-action-systray.cpp +++ b/plugins/base/macro-action-systray.cpp @@ -152,11 +152,7 @@ void MacroActionSystrayEdit::CheckIfTrayIsDisabled() void MacroActionSystrayEdit::MessageChanged() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_message = _message->text().toStdString(); } diff --git a/plugins/base/macro-action-timer.cpp b/plugins/base/macro-action-timer.cpp index 14b3da30..7a0aa24e 100644 --- a/plugins/base/macro-action-timer.cpp +++ b/plugins/base/macro-action-timer.cpp @@ -185,11 +185,7 @@ void MacroActionTimerEdit::UpdateEntryData() void MacroActionTimerEdit::ActionTypeChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_actionType = static_cast(value); SetWidgetVisibility(); } @@ -206,21 +202,13 @@ void MacroActionTimerEdit::SetWidgetVisibility() void MacroActionTimerEdit::DurationChanged(const Duration &dur) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_duration = dur; } void MacroActionTimerEdit::MacroChanged(const QString &text) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_macro = text; emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); diff --git a/plugins/base/macro-action-transition.cpp b/plugins/base/macro-action-transition.cpp index fb1ddf30..76618e36 100644 --- a/plugins/base/macro-action-transition.cpp +++ b/plugins/base/macro-action-transition.cpp @@ -318,11 +318,7 @@ void MacroActionTransitionEdit::UpdateEntryData() void MacroActionTransitionEdit::SourceChanged(const SceneItemSelection &item) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_source = item; emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -332,11 +328,7 @@ void MacroActionTransitionEdit::SourceChanged(const SceneItemSelection &item) void MacroActionTransitionEdit::ActionChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_type = static_cast(value); SetWidgetVisibility(); emit HeaderInfoChanged( @@ -345,11 +337,7 @@ void MacroActionTransitionEdit::ActionChanged(int value) void MacroActionTransitionEdit::SceneChanged(const SceneSelection &s) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_scene = s; emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -357,11 +345,7 @@ void MacroActionTransitionEdit::SceneChanged(const SceneSelection &s) void MacroActionTransitionEdit::TransitionChanged(const TransitionSelection &t) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_transition = t; emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -369,11 +353,7 @@ void MacroActionTransitionEdit::TransitionChanged(const TransitionSelection &t) void MacroActionTransitionEdit::DurationChanged(const Duration &dur) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_duration = dur; } @@ -389,11 +369,7 @@ void MacroActionTransitionEdit::SetWidgetVisibility() void MacroActionTransitionEdit::SetTransitionChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_setTransitionType = state; _transitions->setEnabled(state); if (state) { @@ -406,11 +382,7 @@ void MacroActionTransitionEdit::SetTransitionChanged(int state) void MacroActionTransitionEdit::SetDurationChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_setDuration = state; _duration->setEnabled(state); } diff --git a/plugins/base/macro-action-virtual-cam.cpp b/plugins/base/macro-action-virtual-cam.cpp index a03d11ae..8d69949e 100644 --- a/plugins/base/macro-action-virtual-cam.cpp +++ b/plugins/base/macro-action-virtual-cam.cpp @@ -117,11 +117,7 @@ void MacroActionVCamEdit::UpdateEntryData() void MacroActionVCamEdit::ActionChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_action = static_cast(value); } diff --git a/plugins/base/macro-action-wait.cpp b/plugins/base/macro-action-wait.cpp index 41f7f675..16b73871 100644 --- a/plugins/base/macro-action-wait.cpp +++ b/plugins/base/macro-action-wait.cpp @@ -196,11 +196,7 @@ void MacroActionWaitEdit::SetupRandomDurationEdit() void MacroActionWaitEdit::TypeChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); auto type = static_cast(value); if (type == MacroActionWait::Type::FIXED) { @@ -216,11 +212,7 @@ void MacroActionWaitEdit::TypeChanged(int value) void MacroActionWaitEdit::DurationChanged(const Duration &dur) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_duration = dur; emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -228,11 +220,7 @@ void MacroActionWaitEdit::DurationChanged(const Duration &dur) void MacroActionWaitEdit::Duration2Changed(const Duration &dur) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_duration2 = dur; emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); diff --git a/plugins/base/macro-action-websocket.cpp b/plugins/base/macro-action-websocket.cpp index a7a08c0c..d49f972b 100644 --- a/plugins/base/macro-action-websocket.cpp +++ b/plugins/base/macro-action-websocket.cpp @@ -303,12 +303,8 @@ void MacroActionWebsocketEdit::UpdateEntryData() void MacroActionWebsocketEdit::APITypeChanged(int index) { - if (_loading || !_entryData) { - return; - } - { - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_api = static_cast(index); } @@ -339,11 +335,7 @@ void MacroActionWebsocketEdit::APITypeChanged(int index) void MacroActionWebsocketEdit::MessageTypeChanged(int index) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_type = static_cast(index); SetWidgetVisibility(); @@ -353,11 +345,7 @@ void MacroActionWebsocketEdit::MessageTypeChanged(int index) void MacroActionWebsocketEdit::MessageChanged() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_message = _message->toPlainText().toUtf8().constData(); adjustSize(); @@ -367,11 +355,7 @@ void MacroActionWebsocketEdit::MessageChanged() void MacroActionWebsocketEdit::ConnectionSelectionChanged( const QString &connection) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_connection = GetWeakConnectionByQString(connection); CheckForSettingsConflict(); emit(HeaderInfoChanged(connection)); diff --git a/plugins/base/macro-condition-audio.cpp b/plugins/base/macro-condition-audio.cpp index e810389e..414c1ccd 100644 --- a/plugins/base/macro-condition-audio.cpp +++ b/plugins/base/macro-condition-audio.cpp @@ -568,12 +568,8 @@ void MacroConditionAudioEdit::UpdateVolmeterSource() void MacroConditionAudioEdit::SourceChanged(const SourceSelection &source) { - if (_loading || !_entryData) { - return; - } - { - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_audioSource = source; _entryData->ResetVolmeter(); } @@ -586,11 +582,8 @@ void MacroConditionAudioEdit::SourceChanged(const SourceSelection &source) void MacroConditionAudioEdit::VolumePercentChanged( const NumberVariable &vol) { - if (_loading || !_entryData) { - return; - } { - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_volumePercent = vol; } @@ -599,42 +592,27 @@ void MacroConditionAudioEdit::VolumePercentChanged( void MacroConditionAudioEdit::SyncOffsetChanged(const NumberVariable &value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_syncOffset = value; } void MacroConditionAudioEdit::MonitorTypeChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_monitorType = static_cast(value); } void MacroConditionAudioEdit::BalanceChanged(const NumberVariable &value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_balance = value; } void MacroConditionAudioEdit::VolumeDBChanged( const NumberVariable &value) { - if (_loading || !_entryData) { - return; - } { - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_volumeDB = value; } SyncSliderAndValueSelection(false); @@ -642,11 +620,7 @@ void MacroConditionAudioEdit::VolumeDBChanged( void MacroConditionAudioEdit::PercentDBClicked() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_useDb = !_entryData->_useDb; SetWidgetVisibility(); } @@ -706,11 +680,7 @@ void MacroConditionAudioEdit::ConditionChanged(int cond) void MacroConditionAudioEdit::CheckTypeChanged(int idx) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->SetType(static_cast( _checkTypes->itemData(idx).toInt())); diff --git a/plugins/base/macro-condition-clipboard.cpp b/plugins/base/macro-condition-clipboard.cpp index b0d1aad4..fad0e0d7 100644 --- a/plugins/base/macro-condition-clipboard.cpp +++ b/plugins/base/macro-condition-clipboard.cpp @@ -240,11 +240,7 @@ MacroConditionClipboardEdit::Create(QWidget *parent, void MacroConditionClipboardEdit::ConditionChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->SetCondition( static_cast(value)); SetWidgetVisibility(); @@ -252,11 +248,7 @@ void MacroConditionClipboardEdit::ConditionChanged(int value) void MacroConditionClipboardEdit::TextChanged() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_text = _text->toPlainText().toStdString(); adjustSize(); updateGeometry(); @@ -264,11 +256,7 @@ void MacroConditionClipboardEdit::TextChanged() void MacroConditionClipboardEdit::RegexChanged(const RegexConfig &conf) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_regex = conf; adjustSize(); updateGeometry(); diff --git a/plugins/base/macro-condition-cursor.cpp b/plugins/base/macro-condition-cursor.cpp index 8bcf926c..b6417d97 100644 --- a/plugins/base/macro-condition-cursor.cpp +++ b/plugins/base/macro-condition-cursor.cpp @@ -225,11 +225,7 @@ MacroConditionCursorEdit::MacroConditionCursorEdit( void MacroConditionCursorEdit::ConditionChanged(int index) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_condition = static_cast( _conditions->itemData(index).toInt()); SetWidgetVisibility(); @@ -237,55 +233,35 @@ void MacroConditionCursorEdit::ConditionChanged(int index) void MacroConditionCursorEdit::ButtonChanged(int index) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_button = static_cast( _buttons->itemData(index).toInt()); } void MacroConditionCursorEdit::MinXChanged(const NumberVariable &pos) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_minX = pos; SetupFrame(); } void MacroConditionCursorEdit::MinYChanged(const NumberVariable &pos) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_minY = pos; SetupFrame(); } void MacroConditionCursorEdit::MaxXChanged(const NumberVariable &pos) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_maxX = pos; SetupFrame(); } void MacroConditionCursorEdit::MaxYChanged(const NumberVariable &pos) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_maxY = pos; SetupFrame(); } diff --git a/plugins/base/macro-condition-date.cpp b/plugins/base/macro-condition-date.cpp index 389791c9..e1e478c7 100644 --- a/plugins/base/macro-condition-date.cpp +++ b/plugins/base/macro-condition-date.cpp @@ -517,11 +517,7 @@ MacroConditionDateEdit::MacroConditionDateEdit( void MacroConditionDateEdit::DayOfWeekChanged(int day) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_dayOfWeek = static_cast(day); emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -529,11 +525,7 @@ void MacroConditionDateEdit::DayOfWeekChanged(int day) void MacroConditionDateEdit::ConditionChanged(int cond) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_condition = static_cast(cond); SetWidgetStatus(); @@ -543,11 +535,7 @@ void MacroConditionDateEdit::ConditionChanged(int cond) void MacroConditionDateEdit::DateChanged(const QDate &date) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->SetDate1(date); emit HeaderInfoChanged( @@ -556,11 +544,7 @@ void MacroConditionDateEdit::DateChanged(const QDate &date) void MacroConditionDateEdit::TimeChanged(const QTime &time) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->SetTime1(time); emit HeaderInfoChanged( @@ -569,53 +553,33 @@ void MacroConditionDateEdit::TimeChanged(const QTime &time) void MacroConditionDateEdit::Date2Changed(const QDate &date) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->SetDate2(date); } void MacroConditionDateEdit::Time2Changed(const QTime &time) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->SetTime2(time); } void MacroConditionDateEdit::IgnoreDateChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_ignoreDate = !state; SetWidgetStatus(); } void MacroConditionDateEdit::IgnoreTimeChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_ignoreTime = !state; SetWidgetStatus(); } void MacroConditionDateEdit::RepeatChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_repeat = state; _duration->setDisabled(!state); SetWidgetStatus(); @@ -623,31 +587,20 @@ void MacroConditionDateEdit::RepeatChanged(int state) void MacroConditionDateEdit::UpdateOnRepeatChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_updateOnRepeat = state; } void MacroConditionDateEdit::DurationChanged(const Duration &dur) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_duration = dur; } void MacroConditionDateEdit::AdvancedSettingsToggleClicked() { - if (_loading || !_entryData) { - return; - } { - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_dayOfWeekCheck = !_entryData->_dayOfWeekCheck; } diff --git a/plugins/base/macro-condition-display.cpp b/plugins/base/macro-condition-display.cpp index 651c4ac2..eefcb6ba 100644 --- a/plugins/base/macro-condition-display.cpp +++ b/plugins/base/macro-condition-display.cpp @@ -313,11 +313,7 @@ MacroConditionDisplayEdit::MacroConditionDisplayEdit( void MacroConditionDisplayEdit::ConditionChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->SetCondition( static_cast(value)); SetWidgetVisibility(); @@ -325,32 +321,20 @@ void MacroConditionDisplayEdit::ConditionChanged(int value) void MacroConditionDisplayEdit::CompareModeChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_compare = static_cast(value); } void MacroConditionDisplayEdit::DisplayNameChanged(const QString &display) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_displayName = display.toStdString(); } void MacroConditionDisplayEdit::RegexChanged(const RegexConfig &conf) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_regexConf = conf; adjustSize(); @@ -360,43 +344,27 @@ void MacroConditionDisplayEdit::RegexChanged(const RegexConfig &conf) void MacroConditionDisplayEdit::DisplayCountChanged( const NumberVariable &value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_displayCount = value; } void MacroConditionDisplayEdit::DisplayWidthChanged( const NumberVariable &value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_displayWidth = value; } void MacroConditionDisplayEdit::DisplayHeightChanged( const NumberVariable &value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_displayHeight = value; } void MacroConditionDisplayEdit::UseDevicePixelRatioChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_useDevicePixelRatio = state; } diff --git a/plugins/base/macro-condition-file.cpp b/plugins/base/macro-condition-file.cpp index fcb70025..6a166c13 100644 --- a/plugins/base/macro-condition-file.cpp +++ b/plugins/base/macro-condition-file.cpp @@ -357,11 +357,7 @@ void MacroConditionFileEdit::FileTypeChanged(int index) void MacroConditionFileEdit::ConditionChanged(int index) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->SetCondition( static_cast(index)); SetWidgetVisibility(); @@ -369,11 +365,7 @@ void MacroConditionFileEdit::ConditionChanged(int index) void MacroConditionFileEdit::PathChanged(const QString &text) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_file = text.toUtf8().constData(); emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -381,11 +373,7 @@ void MacroConditionFileEdit::PathChanged(const QString &text) void MacroConditionFileEdit::MatchTextChanged() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_text = _matchText->toPlainText().toUtf8().constData(); adjustSize(); @@ -394,11 +382,7 @@ void MacroConditionFileEdit::MatchTextChanged() void MacroConditionFileEdit::RegexChanged(const RegexConfig &conf) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_regex = conf; adjustSize(); updateGeometry(); @@ -406,21 +390,13 @@ void MacroConditionFileEdit::RegexChanged(const RegexConfig &conf) void MacroConditionFileEdit::CheckModificationDateChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_useTime = state; } void MacroConditionFileEdit::OnlyMatchIfChangedChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_onlyMatchIfChanged = state; } diff --git a/plugins/base/macro-condition-filter.cpp b/plugins/base/macro-condition-filter.cpp index ca33a578..23df67bf 100644 --- a/plugins/base/macro-condition-filter.cpp +++ b/plugins/base/macro-condition-filter.cpp @@ -271,22 +271,14 @@ MacroConditionFilterEdit::MacroConditionFilterEdit( void MacroConditionFilterEdit::SourceChanged(const SourceSelection &source) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_source = source; } void MacroConditionFilterEdit::FilterChanged(const FilterSelection &filter) { - if (_loading || !_entryData) { - return; - } - { - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_filter = filter; } const auto filters = @@ -299,11 +291,7 @@ void MacroConditionFilterEdit::FilterChanged(const FilterSelection &filter) void MacroConditionFilterEdit::ConditionChanged(int index) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->SetCondition( static_cast(index)); SetWidgetVisibility(); @@ -342,11 +330,7 @@ void MacroConditionFilterEdit::GetSettingsClicked() void MacroConditionFilterEdit::SettingsChanged() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_settings = _settings->toPlainText().toStdString(); adjustSize(); @@ -355,11 +339,7 @@ void MacroConditionFilterEdit::SettingsChanged() void MacroConditionFilterEdit::RegexChanged(const RegexConfig &conf) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_regex = conf; adjustSize(); @@ -369,11 +349,7 @@ void MacroConditionFilterEdit::RegexChanged(const RegexConfig &conf) void MacroConditionFilterEdit::SettingSelectionChanged( const SourceSetting &setting) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_setting = setting; } diff --git a/plugins/base/macro-condition-folder.cpp b/plugins/base/macro-condition-folder.cpp index 6df4b8e2..b193b932 100644 --- a/plugins/base/macro-condition-folder.cpp +++ b/plugins/base/macro-condition-folder.cpp @@ -343,22 +343,14 @@ void MacroConditionFolderEdit::UpdateEntryData() void MacroConditionFolderEdit::ConditionChanged(int index) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_condition = static_cast( _conditions->itemData(index).toInt()); } void MacroConditionFolderEdit::PathChanged(const QString &text) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->SetFolder(text.toStdString()); emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -366,32 +358,20 @@ void MacroConditionFolderEdit::PathChanged(const QString &text) void MacroConditionFolderEdit::RegexChanged(const RegexConfig ®ex) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_regex = regex; _entryData->_regex.SetEnabled(true); } void MacroConditionFolderEdit::FilterChanged() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_filter = _filter->text().toStdString(); } void MacroConditionFolderEdit::EnableFilterChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_enableFilter = value; SetWidgetVisibility(); } diff --git a/plugins/base/macro-condition-hotkey.cpp b/plugins/base/macro-condition-hotkey.cpp index 26cd03f2..e464e5a1 100644 --- a/plugins/base/macro-condition-hotkey.cpp +++ b/plugins/base/macro-condition-hotkey.cpp @@ -107,11 +107,7 @@ MacroConditionHotkeyEdit::MacroConditionHotkeyEdit( void MacroConditionHotkeyEdit::NameChanged() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); const auto name = _name->text().toStdString(); // In case a hotkey is used by multiple conditions create a new hotkey // with the new description or get an existing hotkey matching this @@ -139,11 +135,7 @@ void MacroConditionHotkeyEdit::UpdateEntryData() void MacroConditionHotkeyEdit::KeyStateChanged(int index) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_checkPressed = index == 0; } diff --git a/plugins/base/macro-condition-idle.cpp b/plugins/base/macro-condition-idle.cpp index ce7c20b6..5e150fce 100644 --- a/plugins/base/macro-condition-idle.cpp +++ b/plugins/base/macro-condition-idle.cpp @@ -56,11 +56,7 @@ MacroConditionIdleEdit::MacroConditionIdleEdit( void MacroConditionIdleEdit::DurationChanged(const Duration &dur) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_duration = dur; } diff --git a/plugins/base/macro-condition-media.cpp b/plugins/base/macro-condition-media.cpp index 0f230400..de4a05a6 100644 --- a/plugins/base/macro-condition-media.cpp +++ b/plugins/base/macro-condition-media.cpp @@ -761,11 +761,7 @@ void MacroConditionMediaEdit::TimeRestrictionChanged(int index) void MacroConditionMediaEdit::TimeChanged(const Duration &dur) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_time = dur; if (_entryData->GetSourceType() != MacroConditionMedia::SourceType::SOURCE) { diff --git a/plugins/base/macro-condition-plugin-state.cpp b/plugins/base/macro-condition-plugin-state.cpp index edf055a8..d7212f3a 100644 --- a/plugins/base/macro-condition-plugin-state.cpp +++ b/plugins/base/macro-condition-plugin-state.cpp @@ -152,11 +152,7 @@ MacroConditionPluginStateEdit::MacroConditionPluginStateEdit( void MacroConditionPluginStateEdit::ConditionChanged(int idx) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->SetCondition( static_cast( _condition->itemData(idx).toInt())); diff --git a/plugins/base/macro-condition-recording.cpp b/plugins/base/macro-condition-recording.cpp index 7e4a09ae..95dfe664 100644 --- a/plugins/base/macro-condition-recording.cpp +++ b/plugins/base/macro-condition-recording.cpp @@ -122,11 +122,7 @@ MacroConditionRecordEdit::MacroConditionRecordEdit( void MacroConditionRecordEdit::ConditionChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->SetCondition( static_cast(value)); SetWidgetVisibility(); @@ -146,11 +142,7 @@ void MacroConditionRecordEdit::UpdateEntryData() void MacroConditionRecordEdit::DurationChanged(const Duration &duration) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_duration = duration; } diff --git a/plugins/base/macro-condition-replay-buffer.cpp b/plugins/base/macro-condition-replay-buffer.cpp index 55828894..f3c8561a 100644 --- a/plugins/base/macro-condition-replay-buffer.cpp +++ b/plugins/base/macro-condition-replay-buffer.cpp @@ -114,11 +114,7 @@ MacroConditionReplayBufferEdit::MacroConditionReplayBufferEdit( void MacroConditionReplayBufferEdit::StateChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_state = static_cast(value); } diff --git a/plugins/base/macro-condition-run.cpp b/plugins/base/macro-condition-run.cpp index 17c2d29a..d4e1affd 100644 --- a/plugins/base/macro-condition-run.cpp +++ b/plugins/base/macro-condition-run.cpp @@ -193,41 +193,25 @@ void MacroConditionRunEdit::UpdateEntryData() void MacroConditionRunEdit::TimeoutChanged(const Duration &dur) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_timeout = dur; } void MacroConditionRunEdit::CheckExitCodeChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_checkExitCode = state; } void MacroConditionRunEdit::ExitCodeChanged(int exitCode) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_exitCodeToCheck = exitCode; } void MacroConditionRunEdit::ProcessConfigChanged(const ProcessConfig &conf) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_procConfig = conf; adjustSize(); updateGeometry(); diff --git a/plugins/base/macro-condition-scene-order.cpp b/plugins/base/macro-condition-scene-order.cpp index c12a9317..ffd988a6 100644 --- a/plugins/base/macro-condition-scene-order.cpp +++ b/plugins/base/macro-condition-scene-order.cpp @@ -258,21 +258,13 @@ MacroConditionSceneOrderEdit::MacroConditionSceneOrderEdit( void MacroConditionSceneOrderEdit::SceneChanged(const SceneSelection &s) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_scene = s; } void MacroConditionSceneOrderEdit::SourceChanged(const SceneItemSelection &item) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_source = item; emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -282,11 +274,7 @@ void MacroConditionSceneOrderEdit::SourceChanged(const SceneItemSelection &item) void MacroConditionSceneOrderEdit::Source2Changed(const SceneItemSelection &item) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_source2 = item; emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -296,11 +284,8 @@ void MacroConditionSceneOrderEdit::Source2Changed(const SceneItemSelection &item void MacroConditionSceneOrderEdit::ConditionChanged(int index) { - if (_loading || !_entryData) { - return; - } { - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_condition = static_cast(index); } @@ -322,11 +307,7 @@ void MacroConditionSceneOrderEdit::ConditionChanged(int index) void MacroConditionSceneOrderEdit::PositionChanged( const NumberVariable &value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_position = value; } diff --git a/plugins/base/macro-condition-scene-visibility.cpp b/plugins/base/macro-condition-scene-visibility.cpp index 248fc8a4..b7e7736b 100644 --- a/plugins/base/macro-condition-scene-visibility.cpp +++ b/plugins/base/macro-condition-scene-visibility.cpp @@ -170,11 +170,7 @@ MacroConditionSceneVisibilityEdit::MacroConditionSceneVisibilityEdit( void MacroConditionSceneVisibilityEdit::SourceChanged( const SceneItemSelection &item) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_source = item; emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -184,11 +180,7 @@ void MacroConditionSceneVisibilityEdit::SourceChanged( void MacroConditionSceneVisibilityEdit::SceneChanged(const SceneSelection &s) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_scene = s; emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); @@ -196,11 +188,7 @@ void MacroConditionSceneVisibilityEdit::SceneChanged(const SceneSelection &s) void MacroConditionSceneVisibilityEdit::ConditionChanged(int index) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_condition = static_cast(index); if (_entryData->_condition == diff --git a/plugins/base/macro-condition-source.cpp b/plugins/base/macro-condition-source.cpp index 15b58e85..79898334 100644 --- a/plugins/base/macro-condition-source.cpp +++ b/plugins/base/macro-condition-source.cpp @@ -320,12 +320,8 @@ MacroConditionSourceEdit::MacroConditionSourceEdit( void MacroConditionSourceEdit::SourceChanged(const SourceSelection &source) { - if (_loading || !_entryData) { - return; - } - { - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_source = source; } _settingSelection->SetSource(_entryData->_source.GetSource()); @@ -336,11 +332,7 @@ void MacroConditionSourceEdit::SourceChanged(const SourceSelection &source) void MacroConditionSourceEdit::ConditionChanged(int index) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->SetCondition( static_cast(index)); SetWidgetVisibility(); @@ -372,11 +364,7 @@ void MacroConditionSourceEdit::GetSettingsClicked() void MacroConditionSourceEdit::SettingsChanged() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_settings = _settings->toPlainText().toStdString(); adjustSize(); @@ -385,11 +373,7 @@ void MacroConditionSourceEdit::SettingsChanged() void MacroConditionSourceEdit::RegexChanged(const RegexConfig &conf) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_regex = conf; adjustSize(); @@ -399,11 +383,7 @@ void MacroConditionSourceEdit::RegexChanged(const RegexConfig &conf) void MacroConditionSourceEdit::SettingSelectionChanged( const SourceSetting &setting) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_setting = setting; } @@ -414,21 +394,13 @@ void MacroConditionSourceEdit::RefreshVariableSourceSelectionValue() void MacroConditionSourceEdit::SizeChanged(const NumberVariable &value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_size = value; } void MacroConditionSourceEdit::CompareMethodChanged(int index) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_comparision = static_cast(index); } diff --git a/plugins/base/macro-condition-studio-mode.cpp b/plugins/base/macro-condition-studio-mode.cpp index dec28aa1..dab40c2f 100644 --- a/plugins/base/macro-condition-studio-mode.cpp +++ b/plugins/base/macro-condition-studio-mode.cpp @@ -116,11 +116,7 @@ MacroConditionStudioModeEdit::MacroConditionStudioModeEdit( void MacroConditionStudioModeEdit::ConditionChanged(int cond) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_condition = static_cast(cond); SetWidgetVisibility(); emit HeaderInfoChanged( @@ -129,11 +125,7 @@ void MacroConditionStudioModeEdit::ConditionChanged(int cond) void MacroConditionStudioModeEdit::SceneChanged(const SceneSelection &s) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_scene = s; emit HeaderInfoChanged( QString::fromStdString(_entryData->GetShortDesc())); diff --git a/plugins/base/macro-condition-timer.cpp b/plugins/base/macro-condition-timer.cpp index 91c4adb9..27822a6f 100644 --- a/plugins/base/macro-condition-timer.cpp +++ b/plugins/base/macro-condition-timer.cpp @@ -228,62 +228,38 @@ MacroConditionTimerEdit::MacroConditionTimerEdit( void MacroConditionTimerEdit::TimerTypeChanged(int type) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_type = static_cast(type); SetWidgetVisibility(); } void MacroConditionTimerEdit::DurationChanged(const Duration &dur) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_duration = dur; } void MacroConditionTimerEdit::Duration2Changed(const Duration &dur) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_duration2 = dur; } void MacroConditionTimerEdit::SaveRemainingChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_saveRemaining = state; } void MacroConditionTimerEdit::AutoResetChanged(int state) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_oneshot = !state; } void MacroConditionTimerEdit::PauseContinueClicked() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); if (_entryData->_paused) { timer.start(1000); _entryData->Continue(); @@ -296,11 +272,7 @@ void MacroConditionTimerEdit::PauseContinueClicked() void MacroConditionTimerEdit::ResetClicked() { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->Reset(); } diff --git a/plugins/base/macro-condition-transition.cpp b/plugins/base/macro-condition-transition.cpp index 2d8ce332..69fd1813 100644 --- a/plugins/base/macro-condition-transition.cpp +++ b/plugins/base/macro-condition-transition.cpp @@ -332,12 +332,8 @@ MacroConditionTransitionEdit::MacroConditionTransitionEdit( void MacroConditionTransitionEdit::ConditionChanged(int index) { - if (_loading || !_entryData) { - return; - } - { - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_condition = static_cast( _conditions->itemData(index).toInt()); @@ -350,11 +346,7 @@ void MacroConditionTransitionEdit::ConditionChanged(int index) void MacroConditionTransitionEdit::TransitionChanged( const TransitionSelection &t) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_transition = t; _entryData->ConnectToTransitionSignals(); emit HeaderInfoChanged( @@ -363,21 +355,13 @@ void MacroConditionTransitionEdit::TransitionChanged( void MacroConditionTransitionEdit::SceneChanged(const SceneSelection &s) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_scene = s; } void MacroConditionTransitionEdit::DurationChanged(const Duration &dur) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_duration = dur; } diff --git a/plugins/base/macro-condition-virtual-cam.cpp b/plugins/base/macro-condition-virtual-cam.cpp index 5afe60dd..74a7932a 100644 --- a/plugins/base/macro-condition-virtual-cam.cpp +++ b/plugins/base/macro-condition-virtual-cam.cpp @@ -87,11 +87,7 @@ MacroConditionVCamEdit::MacroConditionVCamEdit( void MacroConditionVCamEdit::StateChanged(int value) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_state = static_cast(value); } diff --git a/plugins/midi/macro-action-midi.cpp b/plugins/midi/macro-action-midi.cpp index 35701cbe..51d23181 100644 --- a/plugins/midi/macro-action-midi.cpp +++ b/plugins/midi/macro-action-midi.cpp @@ -136,12 +136,8 @@ void MacroActionMidiEdit::UpdateEntryData() void MacroActionMidiEdit::DeviceSelectionChanged(const MidiDevice &device) { - if (_loading || !_entryData) { - return; - } - { - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_device = device; } emit HeaderInfoChanged( @@ -158,11 +154,7 @@ void MacroActionMidiEdit::ListenDeviceSelectionChanged(const MidiDevice &dev) void MacroActionMidiEdit::MidiMessageChanged(const MidiMessage &message) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_message = message; } diff --git a/plugins/openvr/macro-condition-openvr.cpp b/plugins/openvr/macro-condition-openvr.cpp index 768888d2..1841c58f 100644 --- a/plugins/openvr/macro-condition-openvr.cpp +++ b/plugins/openvr/macro-condition-openvr.cpp @@ -231,61 +231,37 @@ MacroConditionOpenVREdit::MacroConditionOpenVREdit( void MacroConditionOpenVREdit::MinXChanged(const NumberVariable &pos) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_minX = pos; } void MacroConditionOpenVREdit::MinYChanged(const NumberVariable &pos) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_minY = pos; } void MacroConditionOpenVREdit::MinZChanged(const NumberVariable &pos) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_minZ = pos; } void MacroConditionOpenVREdit::MaxXChanged(const NumberVariable &pos) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_maxX = pos; } void MacroConditionOpenVREdit::MaxYChanged(const NumberVariable &pos) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_maxY = pos; } void MacroConditionOpenVREdit::MaxZChanged(const NumberVariable &pos) { - if (_loading || !_entryData) { - return; - } - - auto lock = LockContext(); + GUARD_LOADING_AND_LOCK(); _entryData->_maxZ = pos; }