Packman Build Service PMBS

obs-studio.changes Changed

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-33.0.0~rc1.tar.xz/build-aux/steam/scripts_windows/install.bat -> obs-studio-33.0.0~rc2.tar.xz/build-aux/steam/scripts_windows/install.bat Changed

@@ -22,32 +22,9 @@
 	mkdir "%PROGRAMDATA%\obs-studio-hook"
 	icacls "%PROGRAMDATA%\obs-studio-hook" /grant "ALL APPLICATION PACKAGES":(OI)(CI)(GR,GE)
 
-:checkDLL
-	echo Checking for 32-bit Virtual Cam registration...
-	reg query "HKLM\SOFTWARE\Classes\CLSID\{A3FCE0F5-3493-419F-958A-ABA1250EC20B}" >nul 2>&1 /reg:32
-	if %errorLevel% == 0 (
-		echo 32-bit Virtual Cam found, skipping install...
-		echo.
-	) else (
-		echo 32-bit Virtual Cam not found, installing...
-		goto install32DLL
-	)
-
-:CheckDLLContinue
-	echo Checking for 64-bit Virtual Cam registration...
-	reg query "HKLM\SOFTWARE\Classes\CLSID\{A3FCE0F5-3493-419F-958A-ABA1250EC20B}" >nul 2>&1 /reg:64
-	if %errorLevel% == 0 (
-		echo 64-bit Virtual Cam found, skipping install...
-		echo.
-	) else (
-		echo 64-bit Virtual Cam not found, installing...
-		goto install64DLL
-	)
-	goto endSuccess
-
 :install32DLL
 	echo Installing 32-bit Virtual Cam...
-	regsvr32.exe /i /s %1\data\obs-plugins\win-dshow\obs-virtualcam-module32.dll
+	regsvr32.exe /i /s %1\core\win-dshow\data\obs-virtualcam-module32.dll
 	reg query "HKLM\SOFTWARE\Classes\CLSID\{A3FCE0F5-3493-419F-958A-ABA1250EC20B}" >nul 2>&1 /reg:32
 	if %errorLevel% == 0 (
 		echo 32-bit Virtual Cam successfully installed
@@ -57,11 +34,10 @@
 		echo.
 		goto endFail
 	)
-	goto checkDLLContinue
 
 :install64DLL
 	echo Installing 64-bit Virtual Cam...
-	regsvr32.exe /i /s %1\data\obs-plugins\win-dshow\obs-virtualcam-module64.dll
+	regsvr32.exe /i /s %1\core\win-dshow\data\obs-virtualcam-module64.dll
 	reg query "HKLM\SOFTWARE\Classes\CLSID\{A3FCE0F5-3493-419F-958A-ABA1250EC20B}" >nul 2>&1 /reg:64
 	if %errorLevel% == 0 (
 		echo 64-bit Virtual Cam successfully installed

obs-studio-33.0.0~rc1.tar.xz/build-aux/steam/scripts_windows/uninstall.bat -> obs-studio-33.0.0~rc2.tar.xz/build-aux/steam/scripts_windows/uninstall.bat Changed

obs-studio-33.0.0~rc1.tar.xz/cmake/common/helpers_common.cmake -> obs-studio-33.0.0~rc2.tar.xz/cmake/common/helpers_common.cmake Changed

obs-studio-33.0.0~rc1.tar.xz/frontend/forms/OBSBasicSourceSelect.ui -> obs-studio-33.0.0~rc2.tar.xz/frontend/forms/OBSBasicSourceSelect.ui Changed

@@ -152,13 +152,13 @@
             <number>0</number>
            </property>
            <property name="verticalScrollBarPolicy">
-            <enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOn</enum>
+            <enum>Qt::ScrollBarPolicy::ScrollBarAsNeeded</enum>
            </property>
            <property name="horizontalScrollBarPolicy">
             <enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOff</enum>
            </property>
            <property name="sizeAdjustPolicy">
-            <enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustToContentsOnFirstShow</enum>
+            <enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustToContents</enum>
            </property>
            <property name="editTriggers">
             <set>QAbstractItemView::EditTrigger::NoEditTriggers</set>
@@ -169,9 +169,6 @@
            <property name="verticalScrollMode">
             <enum>QAbstractItemView::ScrollMode::ScrollPerPixel</enum>
            </property>
-           <property name="horizontalScrollMode">
-            <enum>QAbstractItemView::ScrollMode::ScrollPerPixel</enum>
-           </property>
            <property name="resizeMode">
             <enum>QListView::ResizeMode::Adjust</enum>
            </property>
@@ -490,25 +487,19 @@
                 </widget>
                </item>
                <item>
-                <widget class="QWidget" name="addExistingContainer">
-                 <property name="minimumSize">
-                  <size>
-                   <width>0</width>
-                   <height>0</height>
-                  </size>
-                 </property>
+                <widget class="QFrame" name="addExistingContainer">
                  <layout class="QHBoxLayout" name="horizontalLayout_4">
                   <property name="leftMargin">
-                   <number>0</number>
+                   <number>1</number>
                   </property>
                   <property name="topMargin">
-                   <number>0</number>
+                   <number>1</number>
                   </property>
                   <property name="rightMargin">
-                   <number>0</number>
+                   <number>1</number>
                   </property>
                   <property name="bottomMargin">
-                   <number>0</number>
+                   <number>1</number>
                   </property>
                   <item>
                    <widget class="QPushButton" name="addExistingButton">

obs-studio-33.0.0~rc1.tar.xz/frontend/plugin-manager/InstalledPluginRow.cpp -> obs-studio-33.0.0~rc2.tar.xz/frontend/plugin-manager/InstalledPluginRow.cpp Changed

@@ -101,9 +101,11 @@
 			legacyNotice->setLayout(new QHBoxLayout{});
 			legacyNotice->layout()->setContentsMargins(0, 0, 0, 0);
 
-			auto warningIcon = new QLabel{moduleText};
-			warningIcon->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
-			warningIcon->setPixmap(getWarningIcon().pixmap(16, 16));
+			// TODO: https://github.com/obsproject/obs-studio/issues/14029
+			// Re-enable this icon before the major version where we remove legacy plugin paths.
+			//auto warningIcon = new QLabel{moduleText};
+			//warningIcon->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+			//warningIcon->setPixmap(getWarningIcon().pixmap(16, 16));
 
 			auto legacyInfo =
 				new QLabel{QTStr("PluginManager.Status.Legacy.Description").arg(kLegacyPluginInfoLink),
@@ -112,7 +114,7 @@
 			legacyInfo->setOpenExternalLinks(true);
 			idian::Utils::addClass(legacyInfo, "description");
 
-			legacyNotice->layout()->addWidget(warningIcon);
+			//legacyNotice->layout()->addWidget(warningIcon);
 			legacyNotice->layout()->addWidget(legacyInfo);
 
 			detailsLayout->addWidget(legacyNotice);

obs-studio-33.0.0~rc1.tar.xz/frontend/settings/OBSBasicSettings.cpp -> obs-studio-33.0.0~rc2.tar.xz/frontend/settings/OBSBasicSettings.cpp Changed

obs-studio-33.0.0~rc1.tar.xz/frontend/utility/AdvancedOutput.cpp -> obs-studio-33.0.0~rc2.tar.xz/frontend/utility/AdvancedOutput.cpp Changed

obs-studio-33.0.0~rc1.tar.xz/frontend/utility/SimpleOutput.cpp -> obs-studio-33.0.0~rc2.tar.xz/frontend/utility/SimpleOutput.cpp Changed

obs-studio-33.0.0~rc1.tar.xz/plugins/CMakeLists.txt -> obs-studio-33.0.0~rc2.tar.xz/plugins/CMakeLists.txt Changed

obs-studio-33.0.0~rc1.tar.xz/plugins/obs-browser/browser-scheme.cpp -> obs-studio-33.0.0~rc2.tar.xz/plugins/obs-browser/browser-scheme.cpp Changed

obs-studio-33.0.0~rc1.tar.xz/plugins/obs-browser/browser-version.h -> obs-studio-33.0.0~rc2.tar.xz/plugins/obs-browser/browser-version.h Changed

obs-studio-33.0.0~rc1.tar.xz/plugins/obs-browser/obs-browser-plugin.cpp -> obs-studio-33.0.0~rc2.tar.xz/plugins/obs-browser/obs-browser-plugin.cpp Changed

@@ -79,6 +79,20 @@
 
 bool hwaccel = false;
 
+namespace {
+// Naive conversions between char* (Ex. from libobs) and filesystem::path using the platform codepage.
+std::filesystem::path pathFromUtf8(const char *path)
+{
+	return std::filesystem::path{reinterpret_cast<const char8_t *>(path)};
+}
+
+std::string utf8BytesFromPath(std::filesystem::path path)
+{
+	const std::u8string u8 = path.u8string();
+	return std::string{u8.begin(), u8.end()};
+}
+} // namespace
+
 /* ========================================================================= */
 
 #ifdef ENABLE_BROWSER_QT_LOOP
@@ -732,15 +746,15 @@
 #endif
 
 #if CHROME_VERSION_BUILD > 6533
-static void MigrateProfileConfigDir(std::string oldDir, std::string newDir, bool makeDirs)
+static void MigrateProfileConfigDir(filesystem::path oldDir, filesystem::path newDir, bool makeDirs)
 {
 	namespace fs = std::filesystem;
 
 	BPtr<char> configPath = obs_module_config_path(".");
-	fs::path rootPath{configPath.Get()};
+	fs::path rootPath{pathFromUtf8(configPath.Get())};
 
-	fs::path oldPath = rootPath / fs::path(oldDir);
-	fs::path newPath = rootPath / fs::path(newDir);
+	fs::path oldPath = rootPath / oldDir;
+	fs::path newPath = rootPath / newDir;
 
 	if (!fs::exists(oldPath)) {
 		return;
@@ -757,21 +771,20 @@
 	}
 }
 
-static void MigrateDefaultProfileSubdirs(std::string parent, bool makeDirs)
+static void MigrateDefaultProfileSubdirs(filesystem::path parent, bool makeDirs)
 {
-	constexpr std::array<std::string_view, 3> kMigrationDirectories{
-		"Local Storage",
-		"Session Storage",
-		"Network",
+	namespace fs = std::filesystem;
+
+	constexpr std::array<std::u8string_view, 3> kMigrationDirectories{
+		u8"Local Storage",
+		u8"Session Storage",
+		u8"Network",
 	};
-	constexpr std::string_view kDefaultDirectoryPrefix{"Default/"};
+	constexpr std::u8string_view kDefaultDirectoryPrefix{u8"Default"};
 
-	for (std::string_view directory : kMigrationDirectories) {
-		std::string oldDirectory{parent};
-		oldDirectory.append(directory);
-		std::string newDirectory{parent};
-		newDirectory.append(kDefaultDirectoryPrefix);
-		newDirectory.append(directory);
+	for (std::u8string_view directory : kMigrationDirectories) {
+		fs::path oldDirectory = parent / directory;
+		fs::path newDirectory = parent / kDefaultDirectoryPrefix / directory;
 
 		MigrateProfileConfigDir(oldDirectory, newDirectory, makeDirs);
 	}
@@ -781,7 +794,7 @@
 {
 	namespace fs = std::filesystem;
 	BPtr<char> defaultConfigPath = obs_module_config_path("Default");
-	fs::path defaultPath{defaultConfigPath.Get()};
+	fs::path defaultPath{pathFromUtf8(defaultConfigPath.Get())};
 	// User has already previously launched with Chrome Runtime
 	if (fs::exists(defaultPath)) {
 		blog(LOG_INFO, "obs-browser: Chrome Runtime Default profile detected. No migration necessary.");
@@ -789,7 +802,7 @@
 	}
 
 	BPtr<char> localPrefsConfigPath = obs_module_config_path("LocalPrefs.json");
-	fs::path localPrefs{localPrefsConfigPath.Get()};
+	fs::path localPrefs{pathFromUtf8(localPrefsConfigPath.Get())};
 	// User has never launched old OBS Browser before
 	if (!fs::exists(localPrefs)) {
 		blog(LOG_DEBUG, "obs-browser: Alloy Runtime preferences not found. No migration necessary.");
@@ -807,7 +820,7 @@
 	MigrateDefaultProfileSubdirs("", false);
 
 	BPtr<char> newLocalPrefsConfigPath = obs_module_config_path("Local State");
-	fs::path newLocalPrefs{newLocalPrefsConfigPath.Get()};
+	fs::path newLocalPrefs{pathFromUtf8(newLocalPrefsConfigPath.Get())};
 	try {
 		fs::copy(localPrefs, newLocalPrefs);
 	} catch (const fs::filesystem_error &error) {
@@ -817,24 +830,24 @@
 	constexpr std::string_view prefix = "obs_profile_cookies";
 
 	BPtr<char> serviceProfilesPath = obs_module_config_path(prefix.data());
-	fs::path serviceProfiles{serviceProfilesPath.Get()};
+	fs::path serviceProfiles{pathFromUtf8(serviceProfilesPath.Get())};
 	if (fs::exists(serviceProfiles)) {
 		// User has service integration cookies that also must be copied
 		for (auto const &dir_entry : std::filesystem::directory_iterator{serviceProfiles}) {
 			if (!dir_entry.is_directory()) {
 				continue;
 			}
-			std::string name{dir_entry.path().filename().string()};
-			std::string oldDir{prefix};
-			oldDir.append("/");
-			oldDir.append(name);
-
-			std::string newDir{prefix};
-			newDir.append("_");
-			newDir.append(name);
+			fs::path name{dir_entry.path().filename()};
+
+			fs::path oldDir = fs::path{prefix} / name;
+
+			fs::path newDir{prefix};
+			newDir += "_";
+			newDir += name;
+
 			MigrateProfileConfigDir(oldDir, newDir, true);
 
-			blog(LOG_INFO, "obs-browser: Migrated cookies for %s.", name.c_str());
+			blog(LOG_INFO, "obs-browser: Migrated cookies for %s.", utf8BytesFromPath(name).c_str());
 		}
 	}

obs-studio-33.0.0~rc1.tar.xz/plugins/rtmp-services/data/package.json -> obs-studio-33.0.0~rc2.tar.xz/plugins/rtmp-services/data/package.json Changed

obs-studio-33.0.0~rc1.tar.xz/plugins/rtmp-services/data/services.json -> obs-studio-33.0.0~rc2.tar.xz/plugins/rtmp-services/data/services.json Changed

@@ -271,43 +271,6 @@
             }
         },
         {
-            "name": "Loola.tv",
-            "common": false,
-            "servers": 
-                {
-                    "name": "US East: Virginia",
-                    "url": "rtmp://rtmp.loola.tv/push"
-                },
-                {
-                    "name": "EU Central: Germany",
-                    "url": "rtmp://rtmp-eu.loola.tv/push"
-                },
-                {
-                    "name": "South America: Brazil",
-                    "url": "rtmp://rtmp-sa.loola.tv/push"
-                },
-                {
-                    "name": "Asia/Pacific: Singapore",
-                    "url": "rtmp://rtmp-sg.loola.tv/push"
-                },
-                {
-                    "name": "Middle East: Bahrain",
-                    "url": "rtmp://rtmp-me.loola.tv/push"
-                }
-            ,
-            "recommended": {
-                "keyint": 2,
-                "profile": "high",
-                "max video bitrate": 2500,
-                "max audio bitrate": 160,
-                "bframes": 2,
-                "x264opts": "scenecut=0"
-            },
-            "supported video codecs": 
-                "h264"
-            
-        },
-        {
             "name": "Lovecast",
             "servers": 
                 {
@@ -822,21 +785,6 @@
             
         },
         {
-            "name": "Meridix Live Sports Platform",
-            "servers": 
-                {
-                    "name": "Primary",
-                    "url": "rtmp://publish.meridix.com/live"
-                }
-            ,
-            "recommended": {
-                "max video bitrate": 3500
-            },
-            "supported video codecs": 
-                "h264"
-            
-        },
-        {
             "name": "SOOP",
             "alt_names": 
                 "AfreecaTV",
@@ -877,24 +825,6 @@
             },
             "supported video codecs": 
                 "h264"
-            
-        },
-        {
-            "name": "ePlay",
-            "servers": 
-                {
-                    "name": "ePlay Primary",
-                    "url": "rtmp://live.eplay.link/origin"
-                }
-            ,
-            "recommended": {
-                "keyint": 2,
-                "profile": "main",
-                "max video bitrate": 7500,
-                "max audio bitrate": 192
-            },
-            "supported video codecs": 
-                "h264"
             
         },
         {

obs-studio-33.0.0~rc1.tar.xz/plugins/win-dshow/virtualcam-module/virtualcam-install.bat.in -> obs-studio-33.0.0~rc2.tar.xz/plugins/win-dshow/virtualcam-module/virtualcam-install.bat.in Changed

@@ -11,33 +11,10 @@
 		goto end
 	)
 
-:checkDLL
-	echo Checking for 32-bit Virtual Cam registration...
-	reg query "HKLM\SOFTWARE\Classes\WOW6432Node\CLSID\{@VIRTUALCAM_GUID@}" >nul 2>&1
-	if %errorLevel% == 0 (
-		echo 32-bit Virtual Cam found, skipping install...
-		echo.
-	) else (
-		echo 32-bit Virtual Cam not found, installing...
-		goto install32DLL
-	)
-
-:CheckDLLContinue
-	echo Checking for 64-bit Virtual Cam registration...
-	reg query "HKLM\SOFTWARE\Classes\CLSID\{@VIRTUALCAM_GUID@}" >nul 2>&1
-	if %errorLevel% == 0 (
-		echo 64-bit Virtual Cam found, skipping install...
-		echo.
-	) else (
-		echo 64-bit Virtual Cam not found, installing...
-		goto install64DLL
-	)
-	goto endSuccess
-
 :install32DLL
 	echo Installing 32-bit Virtual Cam...
-	if exist "%~dp0\data\core\win-dshow\obs-virtualcam-module32.dll" (
-		regsvr32.exe /i /s "%~dp0\data\core\win-dshow\obs-virtualcam-module32.dll"
+	if exist "%~dp0\core\win-dshow\data\obs-virtualcam-module32.dll" (
+		regsvr32.exe /i /s "%~dp0\core\win-dshow\data\obs-virtualcam-module32.dll"
 	) else (
 		regsvr32.exe /i /s obs-virtualcam-module32.dll
 	)
@@ -50,12 +27,11 @@
 		echo.
 		goto end
 	)
-	goto checkDLLContinue
 
 :install64DLL
 	echo Installing 64-bit Virtual Cam...
-	if exist "%~dp0\data\core\win-dshow\obs-virtualcam-module64.dll" (
-		regsvr32.exe /i /s "%~dp0\data\core\win-dshow\obs-virtualcam-module64.dll"
+	if exist "%~dp0\core\win-dshow\data\obs-virtualcam-module64.dll" (
+		regsvr32.exe /i /s "%~dp0\core\win-dshow\data\obs-virtualcam-module64.dll"
 	) else (
 		regsvr32.exe /i /s obs-virtualcam-module64.dll
 	)

obs-studio-33.0.0~rc1.tar.xz/plugins/win-dshow/virtualcam-module/virtualcam-uninstall.bat.in -> obs-studio-33.0.0~rc2.tar.xz/plugins/win-dshow/virtualcam-module/virtualcam-uninstall.bat.in Changed

Changes of Revision 13