Request 5253 (accepted)

Overview

Request 5253 (accepted)

- Update to version 26.0.2:
* UI: Fix selecting correct transition when deleting
* UI: Fix non-default transitions going below add vals
* libobs: Update version to 26.0.2
* UI/installer: Add avutil/swscale to file in use check
* coreaudio-encoder: Actually fix coreaudio loading
* libobs: Update version to 26.0.1

Created by boombatower about 4 years ago
In state accepted
Package maintainers: boombatower and frispete

Submit obs-studio

Submit package home:boombatow...es:Multimedia / obs-studio to package Multimedia / obs-studio

obs-studio.changes Changed

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-26.0.1.tar.xz/UI/installer/mp-installer.nsi -> obs-studio-26.0.2.tar.xz/UI/installer/mp-installer.nsi Changed

obs-studio-26.0.1.tar.xz/UI/window-basic-main-transitions.cpp -> obs-studio-26.0.2.tar.xz/UI/window-basic-main-transitions.cpp Changed

@@ -102,6 +102,34 @@
 	ui->transitions->blockSignals(false);
 }
 
+int OBSBasic::TransitionCount()
+{
+	int idx = 0;
+	for (int i = 0; i < ui->transitions->count(); i++) {
+		QVariant v = ui->transitions->itemData(i);
+		if (!v.toString().isEmpty()) {
+			idx = i;
+			break;
+		}
+	}
+
+	/* should always have at least fade and cut due to them being
+	 * defaults */
+	assert(idx != 0);
+	return idx - 1; /* remove separator from equation */
+}
+
+int OBSBasic::AddTransitionBeforeSeparator(const QString &name,
+					   obs_source_t *source)
+{
+	int idx = TransitionCount();
+	ui->transitions->blockSignals(true);
+	ui->transitions->insertItem(idx, name,
+				    QVariant::fromValue(OBSSource(source)));
+	ui->transitions->blockSignals(false);
+	return idx;
+}
+
 void OBSBasic::AddQuickTransitionHotkey(QuickTransition *qt)
 {
 	DStr hotkeyId;
@@ -516,10 +544,9 @@
 		source = obs_source_create_private(QT_TO_UTF8(id), name.c_str(),
 						   NULL);
 		InitTransition(source);
-		ui->transitions->addItem(
-			QT_UTF8(name.c_str()),
-			QVariant::fromValue(OBSSource(source)));
-		ui->transitions->setCurrentIndex(ui->transitions->count() - 1);
+		int idx = AddTransitionBeforeSeparator(QT_UTF8(name.c_str()),
+						       source);
+		ui->transitions->setCurrentIndex(idx);
 		CreatePropertiesWindow(source);
 		obs_source_release(source);
 
@@ -558,7 +585,15 @@
 		}
 	}
 
+	ui->transitions->blockSignals(true);
 	ui->transitions->removeItem(idx);
+	ui->transitions->setCurrentIndex(-1);
+	ui->transitions->blockSignals(false);
+
+	int bottomIdx = TransitionCount() - 1;
+	if (idx > bottomIdx)
+		idx = bottomIdx;
+	ui->transitions->setCurrentIndex(idx);
 
 	if (api)
 		api->on_event(OBS_FRONTEND_EVENT_TRANSITION_LIST_CHANGED);
@@ -1550,9 +1585,7 @@
 			obs_source_create_private(id, name, settings);
 		if (!obs_obj_invalid(source)) {
 			InitTransition(source);
-			ui->transitions->addItem(
-				QT_UTF8(name),
-				QVariant::fromValue(OBSSource(source)));
+			AddTransitionBeforeSeparator(QT_UTF8(name), source);
 		}
 
 		obs_data_release(settings);

obs-studio-26.0.1.tar.xz/UI/window-basic-main.hpp -> obs-studio-26.0.2.tar.xz/UI/window-basic-main.hpp Changed

obs-studio-26.0.1.tar.xz/libobs/obs-config.h -> obs-studio-26.0.2.tar.xz/libobs/obs-config.h Changed

obs-studio-26.0.1.tar.xz/plugins/coreaudio-encoder/windows-imports.h -> obs-studio-26.0.2.tar.xz/plugins/coreaudio-encoder/windows-imports.h Changed

Build Results
RPM Lint

Refresh

Comments for request 5253 0

Request History

boombatower created request about 4 years ago

boombatower accepted request about 4 years ago