From adb266927fdc77083f74ae1601da3577fa231ef1 Mon Sep 17 00:00:00 2001
From: WarmUpTill <WarmUpTill@web.de>
Date: Fri, 28 May 2021 20:09:05 +0200
Subject: [PATCH] Move getSourceSettings() to utility

---
 src/headers/utility.hpp        |  1 +
 src/macro-condition-source.cpp | 11 -----------
 src/utility.cpp                | 11 +++++++++++
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/headers/utility.hpp b/src/headers/utility.hpp
index b300629e..c6f2b4c3 100644
--- a/src/headers/utility.hpp
+++ b/src/headers/utility.hpp
@@ -21,6 +21,7 @@ OBSWeakSource GetWeakTransitionByQString(const QString &name);
 OBSWeakSource GetWeakFilterByName(OBSWeakSource source, const char *name);
 OBSWeakSource GetWeakFilterByQString(OBSWeakSource source, const QString &name);
 bool compareIgnoringLineEnding(QString &s1, QString &s2);
+std::string getSourceSettings(OBSWeakSource ws);
 
 /**
  * Populate layout with labels and widgets based on provided text
diff --git a/src/macro-condition-source.cpp b/src/macro-condition-source.cpp
index 18af9997..0bd58ef3 100644
--- a/src/macro-condition-source.cpp
+++ b/src/macro-condition-source.cpp
@@ -21,17 +21,6 @@ static std::map<SourceCondition, std::string> sourceConditionTypes = {
 	 "AdvSceneSwitcher.condition.source.type.settings"},
 };
 
-std::string getSourceSettings(OBSWeakSource ws)
-{
-	auto s = obs_weak_source_get_source(ws);
-	obs_data_t *data = obs_source_get_settings(s);
-	std::string settings = obs_data_get_json(data);
-	obs_data_release(data);
-	obs_source_release(s);
-
-	return settings;
-}
-
 bool checkSettings(const OBSWeakSource &source, const std::string &settings,
 		   bool useRegex)
 {
diff --git a/src/utility.cpp b/src/utility.cpp
index e052be25..1ad1eb82 100644
--- a/src/utility.cpp
+++ b/src/utility.cpp
@@ -207,6 +207,17 @@ bool compareIgnoringLineEnding(QString &s1, QString &s2)
 	return true;
 }
 
+std::string getSourceSettings(OBSWeakSource ws)
+{
+	auto s = obs_weak_source_get_source(ws);
+	obs_data_t *data = obs_source_get_settings(s);
+	std::string settings = obs_data_get_json(data);
+	obs_data_release(data);
+	obs_source_release(s);
+
+	return settings;
+}
+
 bool DisplayMessage(const QString &msg, bool question)
 {
 	if (question) {