frontend: Reduce reliance on transition indexes

Author: tytan652

frontend/widgets/OBSBasic.hpp

@@ -1458,7 +1458,7 @@ private slots:
 	QPointer<QMenu> perSceneTransitionMenu;
 
 	std::unordered_map<std::string, OBSSource> transitions;
-	/* TODO: Reduce usages of an index to identify a transition */
+	/* NOTE: There is a reliance on the order of insertion */
 	std::vector<std::string> transitionUuids;
 	/* FIXME: Replace usages of a name to identify a transition */
 	std::unordered_map<std::string, std::string> transitionNameToUuids;

frontend/widgets/OBSBasic_Transitions.cpp

@@ -779,7 +779,6 @@ QMenu *OBSBasic::CreatePerSceneTransitionMenu()
 {
 	OBSSource scene = GetCurrentSceneSource();
 	QMenu *menu = new QMenu(QTStr("TransitionOverride"));
-	QAction *action;
 
 	OBSDataAutoRelease data = obs_source_get_private_settings(scene);
 
@@ -796,23 +795,24 @@ QMenu *OBSBasic::CreatePerSceneTransitionMenu()
 	duration->setValue(curDuration);
 
 	auto setTransition = [this](QAction *action) {
-		int idx = action->property("transition_index").toInt();
+		std::string uuid = action->property("transition_uuid").toString().toStdString();
 		OBSSource scene = GetCurrentSceneSource();
 		OBSDataAutoRelease data = obs_source_get_private_settings(scene);
-		auto transitionIter = transitions.find(transitionUuids[idx]);
+		auto transitionIter = transitions.find(uuid);
+		OBSSource transition;
 
-		if (idx == -1) {
+		if (uuid.empty()) {
 			obs_data_set_string(data, "transition", "");
 			return;
 		}
 
 		if (transitionIter == transitions.end())
 			return;
 
-		OBSSource tr = transitionIter->second;
+		transition = transitionIter->second;
 
-		if (tr) {
-			const char *name = obs_source_get_name(tr);
+		if (transition) {
+			const char *name = obs_source_get_name(transition);
 			obs_data_set_string(data, "transition", name);
 		}
 	};
@@ -826,20 +826,15 @@ QMenu *OBSBasic::CreatePerSceneTransitionMenu()
 
 	connect(duration, (void(QSpinBox::*)(int)) & QSpinBox::valueChanged, setDuration);
 
-	for (int i = -1; i < (int)transitionUuids.size(); i++) {
+	auto addAction = [&](const std::string &uuid = "") {
 		const char *name = "";
+		QAction *action;
 
-		if (i >= 0) {
-			auto transitionIter = transitions.find(transitionUuids[i]);
-			OBSSource tr;
-
-			if (transitionIter == transitions.end())
-				continue;
-
-			tr = transitionIter->second;
-			if (!tr)
-				continue;
-			name = obs_source_get_name(tr);
+		if (!uuid.empty()) {
+			auto transition = transitions.find(uuid);
+			if (transition == transitions.end())
+				return;
+			name = obs_source_get_name(transition->second);
 		}
 
 		bool match = (name && strcmp(name, curTransition) == 0);
@@ -848,12 +843,16 @@ QMenu *OBSBasic::CreatePerSceneTransitionMenu()
 			name = Str("None");
 
 		action = menu->addAction(QT_UTF8(name));
-		action->setProperty("transition_index", i);
+		action->setProperty("transition_uuid", QString::fromStdString(uuid));
 		action->setCheckable(true);
 		action->setChecked(match);
 
 		connect(action, &QAction::triggered, std::bind(setTransition, action));
-	}
+	};
+
+	addAction();
+	for (const auto &[uuid, transition] : transitions)
+		addAction(uuid);
 
 	QWidgetAction *durationAction = new QWidgetAction(menu);
 	durationAction->setDefaultWidget(duration);
@@ -1059,7 +1058,6 @@ QMenu *OBSBasic::CreateTransitionMenu(QWidget *parent, QuickTransition *qt)
 {
 	QMenu *menu = new QMenu(parent);
 	QAction *action;
-	OBSSource tr;
 
 	if (qt) {
 		action = menu->addAction(QTStr("Remove"));
@@ -1083,8 +1081,6 @@ QMenu *OBSBasic::CreateTransitionMenu(QWidget *parent, QuickTransition *qt)
 			&OBSBasic::QuickTransitionChangeDuration);
 	}
 
-	tr = fadeTransition;
-
 	action = menu->addAction(QTStr("FadeToBlack"));
 	action->setProperty("fadeToBlack", true);
 
@@ -1096,19 +1092,12 @@ QMenu *OBSBasic::CreateTransitionMenu(QWidget *parent, QuickTransition *qt)
 		connect(action, &QAction::triggered, this, &OBSBasic::AddQuickTransition);
 	}
 
-	for (int i = 0; i < (int)transitionUuids.size(); i++) {
-		auto transitionIter = transitions.find(transitionUuids[i]);
-
-		if (transitionIter == transitions.end())
-			continue;
-
-		tr = transitionIter->second;
-
-		if (!tr)
+	for (const auto &[uuid, transition] : transitions) {
+		if (!transition)
 			continue;
 
-		action = menu->addAction(obs_source_get_name(tr));
-		action->setProperty("transition_index", i);
+		action = menu->addAction(obs_source_get_name(transition));
+		action->setProperty("transition_uuid", QString::fromStdString(uuid));
 
 		if (qt) {
 			action->setProperty("id", qt->id);
@@ -1168,10 +1157,10 @@ void OBSBasic::AddQuickTransitionId(int id)
 
 void OBSBasic::AddQuickTransition()
 {
-	int trIdx = sender()->property("transition_index").toInt();
+	std::string transitionUuid = sender()->property("transition_uuid").toString().toStdString();
 	QSpinBox *duration = sender()->property("duration").value<QSpinBox *>();
 	bool fadeToBlack = sender()->property("fadeToBlack").value<bool>();
-	auto transitionIter = transitions.find(transitionUuids[trIdx]);
+	auto transitionIter = transitions.find(transitionUuid);
 	OBSSource transition;
 
 	if (!fadeToBlack && (transitionIter == transitions.end()))
@@ -1228,12 +1217,12 @@ void OBSBasic::QuickTransitionClicked()
 void OBSBasic::QuickTransitionChange()
 {
 	int id = sender()->property("id").toInt();
-	int trIdx = sender()->property("transition_index").toInt();
+	std::string transitionUuid = sender()->property("transition_uuid").toString().toStdString();
 	bool fadeToBlack = sender()->property("fadeToBlack").value<bool>();
 	QuickTransition *qt = GetQuickTransition(id);
 
 	if (qt) {
-		auto transitionIter = transitions.find(transitionUuids[trIdx]);
+		auto transitionIter = transitions.find(transitionUuid);
 		OBSSource tr;
 
 		if (!fadeToBlack && (transitionIter == transitions.end()))