From 2e1d660e174ab7bc030619e7bd9714ee0be833ae Mon Sep 17 00:00:00 2001
From: WarmUpTill <WarmUpTill@web.de>
Date: Sat, 1 May 2021 22:03:45 +0200
Subject: [PATCH] Clean up loading of transition tab settings

---
 src/switch-transitions.cpp | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/switch-transitions.cpp b/src/switch-transitions.cpp
index 04f997e7..6a60bec3 100644
--- a/src/switch-transitions.cpp
+++ b/src/switch-transitions.cpp
@@ -351,18 +351,8 @@ void SwitcherData::loadSceneTransitions(obs_data_t *obj)
 	for (size_t i = 0; i < count; i++) {
 		obs_data_t *array_obj =
 			obs_data_array_item(sceneTransitionsArray, i);
-
-		const char *scene1 = obs_data_get_string(array_obj, "Scene1");
-		const char *scene2 = obs_data_get_string(array_obj, "Scene2");
-		const char *transition =
-			obs_data_get_string(array_obj, "transition");
-		double duration = obs_data_get_double(array_obj, "duration");
-
-		sceneTransitions.emplace_back(
-			GetWeakSourceByName(scene1),
-			GetWeakSourceByName(scene2),
-			GetWeakTransitionByName(transition), duration);
-
+		sceneTransitions.emplace_back();
+		sceneTransitions.back().load(array_obj);
 		obs_data_release(array_obj);
 	}
 	obs_data_array_release(sceneTransitionsArray);
@@ -376,15 +366,8 @@ void SwitcherData::loadSceneTransitions(obs_data_t *obj)
 	for (size_t i = 0; i < count; i++) {
 		obs_data_t *array_obj =
 			obs_data_array_item(defaultTransitionsArray, i);
-
-		const char *scene = obs_data_get_string(array_obj, "Scene");
-		const char *transition =
-			obs_data_get_string(array_obj, "transition");
-
-		defaultSceneTransitions.emplace_back(
-			GetWeakSourceByName(scene),
-			GetWeakTransitionByName(transition));
-
+		defaultSceneTransitions.emplace_back();
+		defaultSceneTransitions.back().load(array_obj);
 		obs_data_release(array_obj);
 	}
 	obs_data_array_release(defaultTransitionsArray);