Split utility headers

plugins/base/macro-action-audio.cpp

@@ -1,7 +1,8 @@
 #include "macro-action-audio.hpp"
 #include "audio-helpers.hpp"
+#include "layout-helpers.hpp"
 #include "macro-helpers.hpp"
-#include "utility.hpp"
+#include "selection-helpers.hpp"
 
 #include <cmath>
 

plugins/base/macro-action-file.cpp

@@ -1,9 +1,9 @@
 #include "macro-action-file.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
 
+#include <QFileDialog>
 #include <QFile>
 #include <QTextStream>
-#include <QFileDialog>
 
 namespace advss {
 

plugins/base/macro-action-filter.cpp

@@ -1,7 +1,8 @@
 #include "macro-action-filter.hpp"
+#include "layout-helpers.hpp"
 #include "json-helpers.hpp"
 #include "source-settings-helpers.hpp"
-#include "utility.hpp"
+#include "selection-helpers.hpp"
 
 namespace advss {
 

plugins/base/macro-action-hotkey.cpp

@@ -1,6 +1,7 @@
 #include "macro-action-hotkey.hpp"
-#include "platform-funcs.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
+#include "selection-helpers.hpp"
+#include "source-helpers.hpp"
 
 #include <thread>
 #include <obs-interaction.h>

plugins/base/macro-action-http.cpp

@@ -1,6 +1,6 @@
 #include "macro-action-http.hpp"
-#include "utility.hpp"
 #include "curl-helper.hpp"
+#include "layout-helpers.hpp"
 
 namespace advss {
 

plugins/base/macro-action-media.cpp

@@ -1,5 +1,6 @@
 #include "macro-action-media.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
+#include "selection-helpers.hpp"
 
 namespace advss {
 

plugins/base/macro-action-osc.cpp

@@ -1,8 +1,7 @@
 #include "macro-action-osc.hpp"
-#include "utility.hpp"
 
-#include <system_error>
 #include <QGroupBox>
+#include <system_error>
 
 namespace advss {
 

plugins/base/macro-action-plugin-state.cpp

@@ -1,10 +1,14 @@
 #include "macro-action-plugin-state.hpp"
+#include "layout-helpers.hpp"
 #include "plugin-state-helpers.hpp"
-#include "utility.hpp"
+#include "selection-helpers.hpp"
+#include "source-helpers.hpp"
+#include "ui-helpers.hpp"
 
-#include <thread>
 #include <condition_variable>
+#include <obs-frontend-api.h>
 #include <QMainWindow>
+#include <thread>
 
 using namespace std::chrono_literals;
 

plugins/base/macro-action-profile.cpp

@@ -1,6 +1,8 @@
 #include "macro-action-profile.hpp"
+#include "layout-helpers.hpp"
 #include "profile-helpers.hpp"
-#include "utility.hpp"
+
+#include <obs-frontend-api.h>
 
 namespace advss {
 

plugins/base/macro-action-projector.cpp

@@ -1,6 +1,10 @@
 #include "macro-action-projector.hpp"
+#include "layout-helpers.hpp"
 #include "monitor-helpers.hpp"
-#include "utility.hpp"
+#include "selection-helpers.hpp"
+#include "source-helpers.hpp"
+
+#include <obs-frontend-api.h>
 
 namespace advss {
 

plugins/base/macro-action-random.cpp

@@ -1,6 +1,6 @@
 #include "macro-action-random.hpp"
+#include "layout-helpers.hpp"
 #include "macro-helpers.hpp"
-#include "utility.hpp"
 
 #include <cstdlib>
 

plugins/base/macro-action-recording.cpp

@@ -1,6 +1,7 @@
 #include "macro-action-recording.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
 
+#include <obs-frontend-api.h>
 #include <util/config-file.h>
 
 namespace advss {

plugins/base/macro-action-replay-buffer.cpp

@@ -1,5 +1,7 @@
 #include "macro-action-replay-buffer.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
+
+#include <obs-frontend-api.h>
 
 namespace advss {
 
@@ -10,7 +12,7 @@ bool MacroActionReplayBuffer::_registered = MacroActionFactory::Register(
 	{MacroActionReplayBuffer::Create, MacroActionReplayBufferEdit::Create,
 	 "AdvSceneSwitcher.action.replay"});
 
-const static std::map<ReplayBufferAction, std::string> actionTypes = {
+static const std::map<ReplayBufferAction, std::string> actionTypes = {
 	{ReplayBufferAction::STOP, "AdvSceneSwitcher.action.replay.type.stop"},
 	{ReplayBufferAction::START,
 	 "AdvSceneSwitcher.action.replay.type.start"},

plugins/base/macro-action-run.cpp

@@ -1,5 +1,5 @@
 #include "macro-action-run.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
 
 #include <QProcess>
 #include <QDesktopServices>

plugins/base/macro-action-scene-collection.cpp

@@ -1,6 +1,9 @@
 #include "macro-action-scene-collection.hpp"
+#include "layout-helpers.hpp"
 #include "plugin-state-helpers.hpp"
-#include "utility.hpp"
+#include "selection-helpers.hpp"
+
+#include <obs-frontend-api.h>
 
 namespace advss {
 

plugins/base/macro-action-scene-lock.cpp

@@ -1,5 +1,5 @@
 #include "macro-action-scene-lock.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
 
 namespace advss {
 

plugins/base/macro-action-scene-order.cpp

@@ -1,5 +1,5 @@
 #include "macro-action-scene-order.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
 
 namespace advss {
 

plugins/base/macro-action-scene-switch.cpp

@@ -1,8 +1,11 @@
 #include "macro-action-scene-switch.hpp"
+#include "layout-helpers.hpp"
 #include "macro-helpers.hpp"
 #include "plugin-state-helpers.hpp"
 #include "scene-switch-helpers.hpp"
-#include "utility.hpp"
+#include "source-helpers.hpp"
+
+#include <obs-frontend-api.h>
 
 namespace advss {
 

plugins/base/macro-action-scene-transform.cpp

@@ -1,7 +1,7 @@
 #include "macro-action-scene-transform.hpp"
 #include "json-helpers.hpp"
 #include "scene-item-transform-helpers.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
 
 #include <graphics/matrix4.h>
 

plugins/base/macro-action-scene-visibility.cpp

@@ -1,5 +1,5 @@
 #include "macro-action-scene-visibility.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
 
 namespace advss {
 

plugins/base/macro-action-screenshot.cpp

@@ -1,5 +1,8 @@
 #include "macro-action-screenshot.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
+#include "selection-helpers.hpp"
+
+#include <obs-frontend-api.h>
 
 namespace advss {
 

plugins/base/macro-action-sequence.cpp

@@ -1,6 +1,6 @@
 #include "macro-action-sequence.hpp"
+#include "layout-helpers.hpp"
 #include "macro-helpers.hpp"
-#include "utility.hpp"
 
 namespace advss {
 

plugins/base/macro-action-source.cpp

@@ -1,7 +1,10 @@
 #include "macro-action-source.hpp"
-#include "source-settings-helpers.hpp"
+#include "layout-helpers.hpp"
 #include "json-helpers.hpp"
-#include "utility.hpp"
+#include "selection-helpers.hpp"
+#include "source-settings-helpers.hpp"
+
+#include <obs-frontend-api.h>
 
 Q_DECLARE_METATYPE(advss::SourceSettingButton);
 

plugins/base/macro-action-streaming.cpp

@@ -1,7 +1,9 @@
 #include "macro-action-streaming.hpp"
+#include "layout-helpers.hpp"
 #include "profile-helpers.hpp"
-#include "utility.hpp"
+#include "ui-helpers.hpp"
 
+#include <obs-frontend-api.h>
 #include <util/config-file.h>
 
 namespace advss {

plugins/base/macro-action-studio-mode.cpp

@@ -1,5 +1,7 @@
 #include "macro-action-studio-mode.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
+
+#include <obs-frontend-api.h>
 
 namespace advss {
 

plugins/base/macro-action-systray.cpp

@@ -1,5 +1,6 @@
 #include "macro-action-systray.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
+#include "ui-helpers.hpp"
 
 namespace advss {
 

plugins/base/macro-action-timer.cpp

@@ -1,7 +1,7 @@
 #include "macro-action-timer.hpp"
+#include "layout-helpers.hpp"
 #include "macro-condition-timer.hpp"
 #include "macro-helpers.hpp"
-#include "utility.hpp"
 
 #include <random>
 

plugins/base/macro-action-transition.cpp

@@ -1,5 +1,7 @@
 #include "macro-action-transition.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
+
+#include <obs-frontend-api.h>
 
 namespace advss {
 

plugins/base/macro-action-virtual-cam.cpp

@@ -1,5 +1,7 @@
 #include "macro-action-virtual-cam.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
+
+#include <obs-frontend-api.h>
 
 namespace advss {
 

plugins/base/macro-action-wait.cpp

@@ -1,7 +1,7 @@
 #include "macro-action-wait.hpp"
+#include "layout-helpers.hpp"
 #include "macro-helpers.hpp"
 #include "sync-helpers.hpp"
-#include "utility.hpp"
 
 #include <random>
 

plugins/base/macro-action-websocket.cpp

@@ -1,5 +1,5 @@
 #include "macro-action-websocket.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
 
 namespace advss {
 

plugins/base/macro-condition-audio.cpp

@@ -1,7 +1,8 @@
 #include "macro-condition-audio.hpp"
 #include "audio-helpers.hpp"
+#include "layout-helpers.hpp"
 #include "macro-helpers.hpp"
-#include "utility.hpp"
+#include "selection-helpers.hpp"
 
 namespace advss {
 

plugins/base/macro-condition-cursor.cpp

@@ -1,9 +1,10 @@
 #include "macro-condition-cursor.hpp"
 #include "cursor-helpers.hpp"
+#include "layout-helpers.hpp"
 #include "utility.hpp"
 
-#include <QScreen>
 #include <QGuiApplication>
+#include <QScreen>
 
 namespace advss {
 

plugins/base/macro-condition-date.cpp

@@ -1,6 +1,6 @@
 #include "macro-condition-date.hpp"
+#include "layout-helpers.hpp"
 #include "macro-helpers.hpp"
-#include "utility.hpp"
 
 #include <QCalendarWidget>
 

plugins/base/macro-condition-display.cpp

@@ -1,6 +1,6 @@
 #include "macro-condition-display.hpp"
+#include "layout-helpers.hpp"
 #include "monitor-helpers.hpp"
-#include "utility.hpp"
 
 #include <QGuiApplication>
 

plugins/base/macro-condition-file.cpp

@@ -1,10 +1,11 @@
 #include "macro-condition-file.hpp"
-#include "utility.hpp"
 #include "curl-helper.hpp"
+#include "layout-helpers.hpp"
 #include "plugin-state-helpers.hpp"
+#include "utility.hpp"
 
-#include <QTextStream>
 #include <QFileDialog>
+#include <QTextStream>
 #include <regex>
 
 namespace advss {

plugins/base/macro-condition-filter.cpp

@@ -1,8 +1,9 @@
 #include "macro-condition-filter.hpp"
-#include "source-settings-helpers.hpp"
+#include "layout-helpers.hpp"
 #include "json-helpers.hpp"
 #include "text-helpers.hpp"
-#include "utility.hpp"
+#include "source-settings-helpers.hpp"
+#include "selection-helpers.hpp"
 
 #include <regex>
 

plugins/base/macro-condition-hotkey.cpp

@@ -1,5 +1,5 @@
 #include "macro-condition-hotkey.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
 
 namespace advss {
 

plugins/base/macro-condition-idle.cpp

@@ -1,6 +1,6 @@
 #include "macro-condition-idle.hpp"
 #include "platform-funcs.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
 
 namespace advss {
 

plugins/base/macro-condition-media.cpp

@@ -1,8 +1,10 @@
 #include "macro-condition-media.hpp"
+#include "layout-helpers.hpp"
 #include "macro-helpers.hpp"
 #include "plugin-state-helpers.hpp"
 #include "scene-switch-helpers.hpp"
-#include "utility.hpp"
+#include "selection-helpers.hpp"
+#include "source-helpers.hpp"
 
 namespace advss {
 

plugins/base/macro-condition-obs-stats.cpp

@@ -1,6 +1,9 @@
 #include "macro-condition-obs-stats.hpp"
+#include "layout-helpers.hpp"
 #include "utility.hpp"
 
+#include <obs-frontend-api.h>
+
 namespace advss {
 
 const std::string MacroConditionStats::id = "obs_stats";

plugins/base/macro-condition-plugin-state.cpp

@@ -1,7 +1,7 @@
 #include "macro-condition-plugin-state.hpp"
+#include "layout-helpers.hpp"
 #include "macro-helpers.hpp"
 #include "plugin-state-helpers.hpp"
-#include "utility.hpp"
 
 namespace advss {
 

plugins/base/macro-condition-process.cpp

@@ -1,6 +1,7 @@
 #include "macro-condition-process.hpp"
+#include "layout-helpers.hpp"
 #include "platform-funcs.hpp"
-#include "utility.hpp"
+#include "selection-helpers.hpp"
 
 #include <regex>
 

plugins/base/macro-condition-profile.cpp

@@ -1,6 +1,8 @@
 #include "macro-condition-profile.hpp"
+#include "layout-helpers.hpp"
 #include "profile-helpers.hpp"
-#include "utility.hpp"
+
+#include <obs-frontend-api.h>
 
 namespace advss {
 

plugins/base/macro-condition-recording.cpp

@@ -1,6 +1,7 @@
 #include "macro-condition-recording.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
 
+#include <obs-frontend-api.h>
 #include <thread>
 
 namespace advss {

plugins/base/macro-condition-replay-buffer.cpp

@@ -1,5 +1,7 @@
 #include "macro-condition-replay-buffer.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
+
+#include <obs-frontend-api.h>
 
 namespace advss {
 

plugins/base/macro-condition-run.cpp

@@ -1,5 +1,5 @@
 #include "macro-condition-run.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
 
 #include <QProcess>
 

plugins/base/macro-condition-scene-order.cpp

@@ -1,5 +1,5 @@
 #include "macro-condition-scene-order.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
 
 namespace advss {
 

plugins/base/macro-condition-scene-transform.cpp

@@ -1,8 +1,8 @@
 #include "macro-condition-scene-transform.hpp"
-#include "scene-item-transform-helpers.hpp"
+#include "layout-helpers.hpp"
 #include "json-helpers.hpp"
 #include "text-helpers.hpp"
-#include "utility.hpp"
+#include "scene-item-transform-helpers.hpp"
 
 namespace advss {
 

plugins/base/macro-condition-scene-visibility.cpp

@@ -1,6 +1,6 @@
 #include "macro-condition-scene-visibility.hpp"
+#include "layout-helpers.hpp"
 #include "obs-module-helper.hpp"
-#include "utility.hpp"
 
 #include <regex>
 

plugins/base/macro-condition-scene.cpp

@@ -1,6 +1,9 @@
 #include "macro-condition-scene.hpp"
+#include "layout-helpers.hpp"
 #include "scene-switch-helpers.hpp"
-#include "utility.hpp"
+#include "source-helpers.hpp"
+
+#include <obs-frontend-api.h>
 
 namespace advss {
 

plugins/base/macro-condition-slideshow.cpp

@@ -1,6 +1,6 @@
 #include "macro-condition-slideshow.hpp"
 #include "macro-helpers.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
 
 namespace advss {
 

plugins/base/macro-condition-source.cpp

@@ -1,8 +1,9 @@
 #include "macro-condition-source.hpp"
-#include "source-settings-helpers.hpp"
+#include "layout-helpers.hpp"
 #include "json-helpers.hpp"
 #include "text-helpers.hpp"
-#include "utility.hpp"
+#include "selection-helpers.hpp"
+#include "source-settings-helpers.hpp"
 
 namespace advss {
 

plugins/base/macro-condition-streaming.cpp

@@ -1,6 +1,8 @@
 #include "macro-condition-streaming.hpp"
 #include "profile-helpers.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
+
+#include <obs-frontend-api.h>
 
 namespace advss {
 

plugins/base/macro-condition-studio-mode.cpp

@@ -1,5 +1,8 @@
 #include "macro-condition-studio-mode.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
+#include "source-helpers.hpp"
+
+#include <obs-frontend-api.h>
 
 namespace advss {
 

plugins/base/macro-condition-timer.cpp

@@ -1,5 +1,5 @@
 #include "macro-condition-timer.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
 
 namespace advss {
 

plugins/base/macro-condition-transition.cpp

@@ -1,6 +1,8 @@
 #include "macro-condition-transition.hpp"
+#include "layout-helpers.hpp"
 #include "scene-switch-helpers.hpp"
-#include "utility.hpp"
+
+#include <obs-frontend-api.h>
 
 namespace advss {
 

plugins/base/macro-condition-virtual-cam.cpp

@@ -1,5 +1,7 @@
 #include "macro-condition-virtual-cam.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
+
+#include <obs-frontend-api.h>
 
 namespace advss {
 

plugins/base/macro-condition-websocket.cpp

@@ -1,5 +1,5 @@
 #include "macro-condition-websocket.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
 
 #include <regex>
 

plugins/base/macro-condition-window.cpp

@@ -1,7 +1,8 @@
 #include "macro-condition-window.hpp"
+#include "layout-helpers.hpp"
 #include "plugin-state-helpers.hpp"
 #include "platform-funcs.hpp"
-#include "utility.hpp"
+#include "selection-helpers.hpp"
 
 #include <regex>
 

plugins/base/utils/connection-manager.cpp

@@ -1,8 +1,9 @@
 #include "connection-manager.hpp"
-#include "utility.hpp"
+#include "layout-helpers.hpp"
+#include "name-dialog.hpp"
 #include "obs-module-helper.hpp"
 #include "plugin-state-helpers.hpp"
-#include "name-dialog.hpp"
+#include "ui-helpers.hpp"
 
 #include <algorithm>
 #include <QAction>

plugins/base/utils/filter-selection.cpp

@@ -1,6 +1,8 @@
 #include "filter-selection.hpp"
 #include "obs-module-helper.hpp"
-#include "utility.hpp"
+#include "selection-helpers.hpp"
+#include "source-helpers.hpp"
+#include "ui-helpers.hpp"
 #include "variable.hpp"
 
 namespace advss {
@@ -164,6 +166,25 @@ void FilterSelectionWidget::Reset()
 	SetFilter(_source, previousSelection);
 }
 
+static QStringList getFilterNames(OBSWeakSource weakSource)
+{
+	if (!weakSource) {
+		return {};
+	}
+
+	QStringList list;
+	auto enumFilters = [](obs_source_t *, obs_source_t *filter, void *ptr) {
+		auto name = obs_source_get_name(filter);
+		QStringList *list = reinterpret_cast<QStringList *>(ptr);
+		*list << QString(name);
+	};
+
+	auto s = obs_weak_source_get_source(weakSource);
+	obs_source_enum_filters(s, enumFilters, &list);
+	obs_source_release(s);
+	return list;
+}
+
 void FilterSelectionWidget::PopulateSelection()
 {
 	const QSignalBlocker b(this);
@@ -180,7 +201,7 @@ void FilterSelectionWidget::PopulateSelection()
 	}
 	_variablesEndIdx = count();
 
-	AddSelectionGroup(this, GetFilterNames(_source.GetSource()));
+	AddSelectionGroup(this, getFilterNames(_source.GetSource()));
 	_filterEndIdx = count();
 
 	// Remove last separator

plugins/base/utils/osc-helpers.cpp

@@ -1,9 +1,10 @@
 #include "osc-helpers.hpp"
 #include "obs-module-helper.hpp"
-#include "utility.hpp"
+#include "ui-helpers.hpp"
 
-#include <string.h>
 #include <QGroupBox>
+#include <QLayout>
+#include <string.h>
 
 #ifdef WIN32
 #include <winsock.h>

plugins/base/utils/process-config.cpp

@@ -1,10 +1,10 @@
 #include "process-config.hpp"
+#include "layout-helpers.hpp"
 #include "log-helper.hpp"
 #include "name-dialog.hpp"
-#include "utility.hpp"
 
-#include <QProcess>
 #include <QFileDialog>
+#include <QProcess>
 
 namespace advss {
 

plugins/base/utils/profile-helpers.cpp

@@ -1,6 +1,6 @@
 #include "profile-helpers.hpp"
 #include "obs-module-helper.hpp"
-#include "utility.hpp"
+#include "selection-helpers.hpp"
 
 #include <obs-frontend-api.h>
 

plugins/base/utils/scene-item-selection.cpp

@@ -1,5 +1,9 @@
 #include "scene-item-selection.hpp"
+#include "layout-helpers.hpp"
 #include "obs-module-helper.hpp"
+#include "selection-helpers.hpp"
+#include "source-helpers.hpp"
+#include "ui-helpers.hpp"
 
 #include <set>
 

plugins/base/utils/scene-item-selection.hpp

@@ -5,9 +5,9 @@
 #include "variable-line-edit.hpp"
 #include "variable-string.hpp"
 #include "regex-config.hpp"
-#include "utility.hpp"
 
 #include <obs-data.h>
+#include <QLayout>
 
 namespace advss {
 

plugins/base/utils/source-setting.cpp

@@ -1,9 +1,11 @@
 #include "source-setting.hpp"
 #include "obs-module-helper.hpp"
 #include "math-helpers.hpp"
+#include "ui-helpers.hpp"
 #include "utility.hpp"
 
 #include <nlohmann/json.hpp>
+#include <QLayout>
 
 Q_DECLARE_METATYPE(advss::SourceSetting);
 

plugins/base/utils/string-list.cpp

@@ -1,6 +1,6 @@
 #include "string-list.hpp"
 #include "name-dialog.hpp"
-#include "utility.hpp"
+#include "ui-helpers.hpp"
 
 #include <QLayout>
 #include <QTimer>

plugins/base/utils/transition-selection.cpp

@@ -1,6 +1,9 @@
 #include "transition-selection.hpp"
 #include "obs-module-helper.hpp"
-#include "utility.hpp"
+#include "selection-helpers.hpp"
+#include "source-helpers.hpp"
+
+#include <obs-frontend-api.h>
 
 namespace advss {