From 7403a18e96981ac57d966b5c0b5f08c8392ee50f Mon Sep 17 00:00:00 2001 From: WarmUpTill <19472752+WarmUpTill@users.noreply.github.com> Date: Tue, 20 May 2025 21:31:34 +0200 Subject: [PATCH] Cleanup --- data/locale/en-US.ini | 2 +- lib/legacy/switch-audio.cpp | 9 +++++---- lib/macro/macro-segment-list.cpp | 2 +- plugins/base/macro-action-audio.cpp | 2 +- plugins/base/macro-action-filter.cpp | 4 ++-- plugins/base/macro-condition-audio.cpp | 8 ++++---- plugins/base/macro-condition-media.cpp | 2 +- plugins/base/macro-condition-window.cpp | 2 +- plugins/base/utils/scene-item-selection.cpp | 6 +++--- plugins/video/macro-condition-video.cpp | 2 +- 10 files changed, 20 insertions(+), 19 deletions(-) diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini index 35e53d84..e9adb58b 100644 --- a/data/locale/en-US.ini +++ b/data/locale/en-US.ini @@ -323,7 +323,7 @@ AdvSceneSwitcher.condition.scene.previousSceneTransitionBehaviour="During transi AdvSceneSwitcher.condition.scene.entry.line1="{{sceneType}}{{scenes}}{{pattern}}{{regex}}" AdvSceneSwitcher.condition.scene.entry.line2="{{useTransitionTargetScene}}" AdvSceneSwitcher.condition.window="Window" -AdvSceneSwitcher.condition.window.entry.window="{{checkTitle}}Window title matches{{windowRegex}}{{windows}}" +AdvSceneSwitcher.condition.window.entry.window="{{checkTitle}}Window title matches{{windows}}{{windowRegex}}" AdvSceneSwitcher.condition.window.entry.fullscreen="{{fullscreen}}Window is fullscreen" AdvSceneSwitcher.condition.window.entry.maximized="{{maximized}}Window is maximized" AdvSceneSwitcher.condition.window.entry.focused="{{focused}}Window is focused" diff --git a/lib/legacy/switch-audio.cpp b/lib/legacy/switch-audio.cpp index 80ace2cc..39ababfe 100644 --- a/lib/legacy/switch-audio.cpp +++ b/lib/legacy/switch-audio.cpp @@ -259,7 +259,8 @@ void AudioSwitch::setVolumeLevel(void *data, const float *, } } -obs_volmeter_t *AddVolmeterToSource(AudioSwitch *entry, obs_weak_source *source) +static obs_volmeter_t *addVolmeterToSource(AudioSwitch *entry, + obs_weak_source *source) { obs_volmeter_t *volmeter = obs_volmeter_create(OBS_FADER_LOG); obs_volmeter_add_callback(volmeter, AudioSwitch::setVolumeLevel, entry); @@ -279,7 +280,7 @@ void AudioSwitch::resetVolmeter() obs_volmeter_remove_callback(volmeter, setVolumeLevel, this); obs_volmeter_destroy(volmeter); - volmeter = AddVolmeterToSource(this, audioSource); + volmeter = addVolmeterToSource(this, audioSource); } bool AudioSwitch::initialized() @@ -318,7 +319,7 @@ void AudioSwitch::load(obs_data_t *obj) duration.Load(obj, "duration"); ignoreInactiveSource = obs_data_get_bool(obj, "ignoreInactiveSource"); - volmeter = AddVolmeterToSource(this, audioSource); + volmeter = addVolmeterToSource(this, audioSource); } void AudioSwitchFallback::save(obs_data_t *obj) @@ -349,7 +350,7 @@ AudioSwitch::AudioSwitch(const AudioSwitch &other) condition(other.condition), duration(other.duration) { - volmeter = AddVolmeterToSource(this, other.audioSource); + volmeter = addVolmeterToSource(this, other.audioSource); } AudioSwitch::AudioSwitch(AudioSwitch &&other) noexcept diff --git a/lib/macro/macro-segment-list.cpp b/lib/macro/macro-segment-list.cpp index abc0e11d..993f2fe9 100644 --- a/lib/macro/macro-segment-list.cpp +++ b/lib/macro/macro-segment-list.cpp @@ -67,7 +67,7 @@ static bool posIsInScrollbar(const QScrollBar *scrollbar, const QPoint &pos) if (!scrollbar->isVisible()) { return false; } - const auto geo = scrollbar->geometry(); + const auto &geo = scrollbar->geometry(); const auto globalGeo = QRect(scrollbar->mapToGlobal(geo.topLeft()), scrollbar->mapToGlobal(geo.bottomRight())); return globalGeo.contains(pos); diff --git a/plugins/base/macro-action-audio.cpp b/plugins/base/macro-action-audio.cpp index 2f0d0739..c2375be6 100644 --- a/plugins/base/macro-action-audio.cpp +++ b/plugins/base/macro-action-audio.cpp @@ -518,7 +518,7 @@ MacroActionAudioEdit::MacroActionAudioEdit( QWidget::connect(_fadeTypes, SIGNAL(currentIndexChanged(int)), this, SLOT(FadeTypeChanged(int))); - std::unordered_map widgetPlaceholders = { + const std::unordered_map widgetPlaceholders = { {"{{audioSources}}", _sources}, {"{{actions}}", _actions}, {"{{syncOffset}}", _syncOffset}, diff --git a/plugins/base/macro-action-filter.cpp b/plugins/base/macro-action-filter.cpp index 783b39c0..859b7217 100644 --- a/plugins/base/macro-action-filter.cpp +++ b/plugins/base/macro-action-filter.cpp @@ -185,8 +185,8 @@ void MacroActionFilter::ResolveVariablesToFixedValues() static inline void populateActionSelection(QComboBox *list) { - for (auto entry : actionTypes) { - list->addItem(obs_module_text(entry.second.c_str())); + for (const auto &[_, name] : actionTypes) { + list->addItem(obs_module_text(name.c_str())); } } diff --git a/plugins/base/macro-condition-audio.cpp b/plugins/base/macro-condition-audio.cpp index 13a04817..a81c66cc 100644 --- a/plugins/base/macro-condition-audio.cpp +++ b/plugins/base/macro-condition-audio.cpp @@ -292,8 +292,8 @@ bool MacroConditionAudio::Save(obs_data_t *obj) const return true; } -obs_volmeter_t *AddVolmeterToSource(MacroConditionAudio *entry, - obs_weak_source *source) +static obs_volmeter_t *addVolmeterToSource(MacroConditionAudio *entry, + obs_weak_source *source) { obs_volmeter_t *volmeter = obs_volmeter_create(OBS_FADER_LOG); obs_volmeter_add_callback(volmeter, MacroConditionAudio::SetVolumeLevel, @@ -328,7 +328,7 @@ bool MacroConditionAudio::Load(obs_data_t *obj) obs_data_get_int(obj, "outputCondition")); _volumeCondition = static_cast( obs_data_get_int(obj, "volumeCondition")); - _volmeter = AddVolmeterToSource(this, _audioSource.GetSource()); + _volmeter = addVolmeterToSource(this, _audioSource.GetSource()); if (obs_data_get_int(obj, "version") < 2) { // Set default values for dB handling @@ -379,7 +379,7 @@ void MacroConditionAudio::ResetVolmeter() obs_volmeter_remove_callback(_volmeter, SetVolumeLevel, this); obs_volmeter_destroy(_volmeter); - _volmeter = AddVolmeterToSource(this, _audioSource.GetSource()); + _volmeter = addVolmeterToSource(this, _audioSource.GetSource()); } void MacroConditionAudio::SetupTempVars() diff --git a/plugins/base/macro-condition-media.cpp b/plugins/base/macro-condition-media.cpp index d7001bd1..a3cc878a 100644 --- a/plugins/base/macro-condition-media.cpp +++ b/plugins/base/macro-condition-media.cpp @@ -256,7 +256,7 @@ void MacroConditionMedia::SetTempVarValues( const auto state = std::get(value); SetTempVarValue("state", std::to_string(state)); } else { - const auto timeInfo = std::get(value); + const auto &timeInfo = std::get(value); SetTempVarValue("time", std::to_string(timeInfo.time)); SetTempVarValue("duration", std::to_string(timeInfo.duration)); } diff --git a/plugins/base/macro-condition-window.cpp b/plugins/base/macro-condition-window.cpp index 5335085e..5fe84d07 100644 --- a/plugins/base/macro-condition-window.cpp +++ b/plugins/base/macro-condition-window.cpp @@ -242,7 +242,7 @@ MacroConditionWindowEdit::MacroConditionWindowEdit( PopulateWindowSelection(_windowSelection); - std::unordered_map widgetPlaceholders = { + const std::unordered_map widgetPlaceholders = { {"{{windows}}", _windowSelection}, {"{{windowRegex}}", _windowRegex}, {"{{checkTitle}}", _checkTitle}, diff --git a/plugins/base/utils/scene-item-selection.cpp b/plugins/base/utils/scene-item-selection.cpp index 001b67a8..8fa53368 100644 --- a/plugins/base/utils/scene-item-selection.cpp +++ b/plugins/base/utils/scene-item-selection.cpp @@ -558,7 +558,7 @@ static bool populateSceneItemSelectionHelper(obs_scene_t *, return true; } -QStringList GetSceneItemsList(SceneSelection &s) +static QStringList getSceneItemsList(SceneSelection &s) { QStringList names; if (s.GetType() != SceneSelection::Type::SCENE) { @@ -589,8 +589,8 @@ QStringList GetSceneItemsList(SceneSelection &s) void SceneItemSelectionWidget::PopulateItemSelection() { - const QStringList sceneItmes = GetSceneItemsList(_scene); - AddSelectionGroup(_sources, sceneItmes, false); + const QStringList sceneItems = getSceneItemsList(_scene); + AddSelectionGroup(_sources, sceneItems, false); _sources->setCurrentIndex(-1); } diff --git a/plugins/video/macro-condition-video.cpp b/plugins/video/macro-condition-video.cpp index 826002b7..9056ab88 100644 --- a/plugins/video/macro-condition-video.cpp +++ b/plugins/video/macro-condition-video.cpp @@ -85,7 +85,7 @@ const static std::map pageSegModes = { "AdvSceneSwitcher.condition.video.ocrMode.sparseTextOSD"}, }; -cv::CascadeClassifier initObjectCascade(std::string &path) +static cv::CascadeClassifier initObjectCascade(std::string &path) { cv::CascadeClassifier cascade; try {