Clean up macro import and add action queues

lib/macro/macro-tab.cpp

@@ -1,4 +1,5 @@
 #include "advanced-scene-switcher.hpp"
+#include "action-queue.hpp"
 #include "macro-action-edit.hpp"
 #include "macro-condition-edit.hpp"
 #include "macro-export-import-dialog.hpp"
@@ -248,6 +249,7 @@ void AdvSceneSwitcher::ExportMacros()
 	}
 	obs_data_set_array(data, "macros", macroArray);
 	SaveVariables(data);
+	SaveActionQueues(data);
 	obs_data_set_string(data, "version", g_GIT_TAG);
 	auto json = obs_data_get_json(data);
 	QString exportString(json);
@@ -370,26 +372,6 @@ bool AdvSceneSwitcher::ResolveMacroImportNameConflict(
 	return true;
 }
 
-static bool variableWithNameExists(const std::string &name)
-{
-	return !!GetVariableByName(name);
-}
-
-static void importVariables(obs_data_t *obj)
-{
-	OBSDataArrayAutoRelease array = obs_data_get_array(obj, "variables");
-	size_t count = obs_data_array_count(array);
-	for (size_t i = 0; i < count; i++) {
-		OBSDataAutoRelease data = obs_data_array_item(array, i);
-		auto var = Variable::Create();
-		var->Load(data);
-		if (variableWithNameExists(var->Name())) {
-			continue;
-		}
-		GetVariables().emplace_back(var);
-	}
-}
-
 void AdvSceneSwitcher::ImportMacros()
 {
 	QString json;
@@ -404,7 +386,8 @@ void AdvSceneSwitcher::ImportMacros()
 		ImportMacros();
 		return;
 	}
-	importVariables(data);
+	ImportVariables(data);
+	ImportQueues(data);
 
 	auto version = obs_data_get_string(data, "version");
 	if (strcmp(version, g_GIT_TAG) != 0) {
@@ -425,6 +408,7 @@ void AdvSceneSwitcher::ImportMacros()
 		OBSDataAutoRelease array_obj = obs_data_array_item(array, i);
 		auto macro = std::make_shared<Macro>();
 		macro->Load(array_obj);
+		RunPostLoadSteps();
 
 		if (macroNameExists(macro->Name()) &&
 		    !ResolveMacroImportNameConflict(macro)) {

lib/utils/action-queue.cpp

@@ -358,6 +358,27 @@ void LoadActionQueues(obs_data_t *obj)
 	}
 }
 
+static bool queueWithNameExists(const std::string &name)
+{
+	return !GetWeakActionQueueByName(name).expired();
+}
+
+void ImportQueues(obs_data_t *data)
+{
+	OBSDataArrayAutoRelease array =
+		obs_data_get_array(data, "actionQueues");
+	size_t count = obs_data_array_count(array);
+	for (size_t i = 0; i < count; i++) {
+		OBSDataAutoRelease arrayElement = obs_data_array_item(array, i);
+		auto queue = ActionQueue::Create();
+		queue->Load(arrayElement);
+		if (queueWithNameExists(queue->Name())) {
+			continue;
+		}
+		queues.emplace_back(queue);
+	}
+}
+
 std::weak_ptr<ActionQueue> GetWeakActionQueueByName(const std::string &name)
 {
 	for (const auto &queue : queues) {

lib/utils/action-queue.hpp

@@ -98,6 +98,7 @@ signals:
 void SetupActionQueues();
 void SaveActionQueues(obs_data_t *);
 void LoadActionQueues(obs_data_t *);
+void ImportQueues(obs_data_t *);
 std::weak_ptr<ActionQueue> GetWeakActionQueueByName(const std::string &name);
 std::weak_ptr<ActionQueue> GetWeakActionQueueByQString(const QString &name);
 std::string GetActionQueueName(const std::weak_ptr<ActionQueue> &);

lib/variables/variable.cpp

@@ -187,6 +187,28 @@ void LoadVariables(obs_data_t *obj)
 	obs_data_array_release(variablesArray);
 }
 
+static bool variableWithNameExists(const std::string &name)
+{
+	return !!GetVariableByName(name);
+}
+
+void ImportVariables(obs_data_t *data)
+{
+	obs_data_array_t *array = obs_data_get_array(data, "variables");
+	size_t count = obs_data_array_count(array);
+	for (size_t i = 0; i < count; i++) {
+		obs_data_t *arrayElement = obs_data_array_item(array, i);
+		auto var = Variable::Create();
+		var->Load(arrayElement);
+		obs_data_release(arrayElement);
+		if (variableWithNameExists(var->Name())) {
+			continue;
+		}
+		GetVariables().emplace_back(var);
+	}
+	obs_data_array_release(array);
+}
+
 static void populateSaveActionSelection(QComboBox *list)
 {
 	list->addItem(

lib/variables/variable.hpp

@@ -88,6 +88,7 @@ signals:
 
 void SaveVariables(obs_data_t *obj);
 void LoadVariables(obs_data_t *obj);
+void ImportVariables(obs_data_t *obj);
 
 std::deque<std::shared_ptr<Item>> &GetVariables();