Packman Build Service PMBS

obs-studio.changes Changed

@@ -1,4 +1,26 @@
 -------------------------------------------------------------------
+Sat Oct 03 01:13:14 UTC 2026 - darix <packman@nordisch.org>
+
+- Update to version 33.0.0~beta6:
+  * obs-websocket: Update version to 5.7.5
+  * shared: Remove Qt<6.10 code
+  * frontend: Remove Qt<6.10 code
+  * linux-v4l2: Remove support for FFmpeg<8.0
+  * obs-ffmpeg: Remove support for FFmpeg<8.0
+  * win-dshow Set minimum FFmpeg version to 8.0
+  * frontend: Set minimum FFmpeg version to 8.0
+  * media-playback: Set minimum FFmpeg version to 8.0
+  * libobs: Increase minimum FFmpeg version to 8.0
+  * decklink: Include previously implicit header for Linux
+  * frontend: Include previously implicit headers for non-Windows
+  * frontend: Restore OBS wrappers in callbacks
+  * docs: Update graphics/image-file.h docs
+  * frontend-tools: Update clock Lua script for new gs_image_file_ex
+  * win-capture: Fix data directory path
+  * cmake: Fix bundling of scripting files on macOS
+  * cmake: Make obs-core-modules header public
+
+-------------------------------------------------------------------
 Thu Oct 01 00:15:18 UTC 2026 - darix <packman@nordisch.org>
 
 - Update to version 33.0.0~beta5:

obs-studio.spec Changed

_service Changed

_servicedata Changed

obs-studio-33.0.0~beta5.tar.xz/cmake/macos/helpers.cmake -> obs-studio-33.0.0~beta6.tar.xz/cmake/macos/helpers.cmake Changed

obs-studio-33.0.0~beta5.tar.xz/docs/sphinx/reference-libobs-graphics-image-file.rst -> obs-studio-33.0.0~beta6.tar.xz/docs/sphinx/reference-libobs-graphics-image-file.rst Changed

@@ -10,24 +10,24 @@
 
    #include <graphics/image-file.h>
 
-.. struct:: gs_image_file
+.. struct:: gs_image_file_ex
 
    Image file structure
 
-.. type:: gs_texture_t *gs_image_file.texture
+.. type:: gs_texture_t *gs_image_file_ex.texture
 
    Texture
 
-.. type:: struct gs_image_file gs_image_file_t
+.. type:: struct gs_image_file_ex gs_image_file_ex_t
 
    Image file type
 
 ---------------------
 
-.. function:: void gs_image_file_init(gs_image_file_t *image, const char *file)
+.. function:: void gs_image_file_ex_init(gs_image_file_ex_t *image, const char *file, enum gs_image_alpha_mode alpha_mode)
 
    Loads an initializes an image file helper.  Does not initialize the
-   texture; call :c:func:`gs_image_file_init_texture()` to initialize
+   texture; call :c:func:`gs_image_file_ex_init_texture()` to initialize
    the texture.
 
    :param image: Image file helper to initialize
@@ -35,7 +35,7 @@
 
 ---------------------
 
-.. function:: void gs_image_file_free(gs_image_file_t *image)
+.. function:: void gs_image_file_ex_free(gs_image_file_ex_t *image)
 
    Frees an image file helper
 
@@ -43,28 +43,28 @@
 
 ---------------------
 
-.. function:: void gs_image_file_init_texture(gs_image_file_t *image)
+.. function:: void gs_image_file_ex_init_texture(gs_image_file_ex_t *image)
 
    Initializes the texture of an image file helper.  This is separate
-   from :c:func:`gs_image_file_init()` because it allows deferring the
+   from :c:func:`gs_image_file_ex_init()` because it allows deferring the
    graphics initialization if needed.
 
    :param image: Image file helper
 
 ---------------------
 
-.. function:: bool gs_image_file_tick(gs_image_file_t *image, uint64_t elapsed_time_ns)
+.. function:: bool gs_image_file_ex_tick(gs_image_file_ex_t *image, uint64_t elapsed_time_ns)
 
    Performs a tick operation on the image file helper (used primarily
    for animated file).  Does not update the texture until
-   :c:func:`gs_image_file_update_texture()` is called.
+   :c:func:`gs_image_file_ex_update_texture()` is called.
 
    :param image:           Image file helper
    :param elapsed_time_ns: Elapsed time in nanoseconds
 
 ---------------------
 
-.. function:: void gs_image_file_update_texture(gs_image_file_t *image)
+.. function:: void gs_image_file_ex_update_texture(gs_image_file_ex_t *image)
 
    Updates the texture (used primarily for animated files)

obs-studio-33.0.0~beta5.tar.xz/frontend/CMakeLists.txt -> obs-studio-33.0.0~beta6.tar.xz/frontend/CMakeLists.txt Changed

obs-studio-33.0.0~beta5.tar.xz/frontend/OBSApp.cpp -> obs-studio-33.0.0~beta6.tar.xz/frontend/OBSApp.cpp Changed

@@ -30,9 +30,6 @@
 
 #if !defined(_WIN32) && !defined(__APPLE__)
 #include <obs-nix-platform.h>
-#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
-#include <qpa/qplatformnativeinterface.h>
-#endif
 #endif
 #include <qt-wrappers.hpp>
 
@@ -48,9 +45,9 @@
 #endif
 
 #include <chrono>
+#include <sstream>
 
 #ifdef _WIN32
-#include <sstream>
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #else
@@ -128,9 +125,7 @@
 	QMessageBox crashWarning;
 
 	crashWarning.setIcon(QMessageBox::Warning);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
 	crashWarning.setOption(QMessageBox::Option::DontUseNativeDialog);
-#endif
 	crashWarning.setWindowTitle(QTStr("CrashHandling.Dialog.Title"));
 	crashWarning.setText(QTStr("CrashHandling.Labels.Text"));
 
@@ -1284,11 +1279,9 @@
 
 #if !defined(_WIN32) && !defined(__APPLE__)
 	if (QApplication::platformName() == "xcb") {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
 		auto native = qGuiApp->nativeInterface<QNativeInterface::QX11Application>();
 
 		obs_set_nix_platform_display(native->display());
-#endif
 
 		obs_set_nix_platform(OBS_NIX_PLATFORM_X11_EGL);
 
@@ -1297,11 +1290,9 @@
 
 #ifdef ENABLE_WAYLAND
 	if (QApplication::platformName().contains("wayland")) {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
 		auto native = qGuiApp->nativeInterface<QNativeInterface::QWaylandApplication>();
 
 		obs_set_nix_platform_display(native->display());
-#endif
 
 		obs_set_nix_platform(OBS_NIX_PLATFORM_WAYLAND);
 		setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
@@ -1310,10 +1301,6 @@
 	}
 #endif
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
-	QPlatformNativeInterface *native = QGuiApplication::platformNativeInterface();
-	obs_set_nix_platform_display(native->nativeResourceForIntegration("display"));
-#endif
 #endif
 
 #ifdef __APPLE__

obs-studio-33.0.0~beta5.tar.xz/frontend/OBSStudioAPI.cpp -> obs-studio-33.0.0~beta6.tar.xz/frontend/OBSStudioAPI.cpp Changed

obs-studio-33.0.0~beta5.tar.xz/frontend/cmake/os-freebsd.cmake -> obs-studio-33.0.0~beta6.tar.xz/frontend/cmake/os-freebsd.cmake Changed

obs-studio-33.0.0~beta5.tar.xz/frontend/cmake/os-linux.cmake -> obs-studio-33.0.0~beta6.tar.xz/frontend/cmake/os-linux.cmake Changed

obs-studio-33.0.0~beta5.tar.xz/frontend/components/SceneTree.cpp -> obs-studio-33.0.0~beta6.tar.xz/frontend/components/SceneTree.cpp Changed

obs-studio-33.0.0~beta5.tar.xz/frontend/components/SceneTree.hpp -> obs-studio-33.0.0~beta6.tar.xz/frontend/components/SceneTree.hpp Changed

obs-studio-33.0.0~beta5.tar.xz/frontend/components/SourceTreeItem.cpp -> obs-studio-33.0.0~beta6.tar.xz/frontend/components/SourceTreeItem.cpp Changed

obs-studio-33.0.0~beta5.tar.xz/frontend/dialogs/OBSBasicFilters.cpp -> obs-studio-33.0.0~beta6.tar.xz/frontend/dialogs/OBSBasicFilters.cpp Changed

obs-studio-33.0.0~beta5.tar.xz/frontend/dialogs/OBSBasicTransform.cpp -> obs-studio-33.0.0~beta6.tar.xz/frontend/dialogs/OBSBasicTransform.cpp Changed

obs-studio-33.0.0~beta5.tar.xz/frontend/dialogs/OBSYoutubeActions.cpp -> obs-studio-33.0.0~beta6.tar.xz/frontend/dialogs/OBSYoutubeActions.cpp Changed

@@ -53,33 +53,26 @@
 		(const QString &link) { QDesktopServices::openUrl(QUrl(link)); });
 
 	ui->scheduledTime->setVisible(false);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
-	connect(ui->checkScheduledLater, &QCheckBox::checkStateChanged, this,
-		&(Qt::CheckState state)
-#else
-	connect(ui->checkScheduledLater, &QCheckBox::stateChanged, this,
-		&(int state)
-#endif
-		{
-			const bool checked = (state == Qt::Checked);
-			ui->scheduledTime->setVisible(checked);
-			if (checked) {
-				ui->checkAutoStart->setVisible(true);
-				ui->checkAutoStop->setVisible(true);
-				ui->helpAutoStartStop->setVisible(true);
-
-				ui->checkAutoStart->setChecked(false);
-				ui->checkAutoStop->setChecked(false);
-			} else {
-				ui->checkAutoStart->setVisible(false);
-				ui->checkAutoStop->setVisible(false);
-				ui->helpAutoStartStop->setVisible(false);
+	connect(ui->checkScheduledLater, &QCheckBox::checkStateChanged, this, &(Qt::CheckState state) {
+		const bool checked = (state == Qt::Checked);
+		ui->scheduledTime->setVisible(checked);
+		if (checked) {
+			ui->checkAutoStart->setVisible(true);
+			ui->checkAutoStop->setVisible(true);
+			ui->helpAutoStartStop->setVisible(true);
+
+			ui->checkAutoStart->setChecked(false);
+			ui->checkAutoStop->setChecked(false);
+		} else {
+			ui->checkAutoStart->setVisible(false);
+			ui->checkAutoStop->setVisible(false);
+			ui->helpAutoStartStop->setVisible(false);
 
-				ui->checkAutoStart->setChecked(true);
-				ui->checkAutoStop->setChecked(true);
-			}
-			UpdateOkButtonStatus();
-		});
+			ui->checkAutoStart->setChecked(true);
+			ui->checkAutoStop->setChecked(true);
+		}
+		UpdateOkButtonStatus();
+	});
 
 	ui->checkAutoStart->setVisible(false);
 	ui->checkAutoStop->setVisible(false);

obs-studio-33.0.0~beta5.tar.xz/frontend/oauth/YoutubeAuth.cpp -> obs-studio-33.0.0~beta6.tar.xz/frontend/oauth/YoutubeAuth.cpp Changed

obs-studio-33.0.0~beta5.tar.xz/frontend/settings/OBSBasicSettings.cpp -> obs-studio-33.0.0~beta6.tar.xz/frontend/settings/OBSBasicSettings.cpp Changed

@@ -776,11 +776,7 @@
 	connect(ui->simpleOutputABitrate, &QComboBox::currentIndexChanged, this,
 		&OBSBasicSettings::SimpleReplayBufferChanged);
 	connect(ui->simpleRBSecMax, &QSpinBox::valueChanged, this, &OBSBasicSettings::SimpleReplayBufferChanged);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 	connect(ui->advOutSplitFile, &QCheckBox::checkStateChanged, this, &OBSBasicSettings::AdvOutSplitFileChanged);
-#else
-	connect(ui->advOutSplitFile, &QCheckBox::stateChanged, this, &OBSBasicSettings::AdvOutSplitFileChanged);
-#endif
 	connect(ui->advOutSplitFileType, &QComboBox::currentIndexChanged, this,
 		&OBSBasicSettings::AdvOutSplitFileChanged);
 	connect(ui->advReplayBuf, &QCheckBox::toggled, this, &OBSBasicSettings::AdvReplayBufferChanged);
@@ -1298,13 +1294,8 @@
 			config_get_bool(App()->GetUserConfig(), "BasicWindow", "HideOBSWindowsFromCapture");
 		ui->hideOBSFromCapture->setChecked(hideWindowFromCapture);
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 		connect(ui->hideOBSFromCapture, &QCheckBox::checkStateChanged, this,
 			&OBSBasicSettings::HideOBSWindowWarning);
-#else
-		connect(ui->hideOBSFromCapture, &QCheckBox::stateChanged, this,
-			&OBSBasicSettings::HideOBSWindowWarning);
-#endif
 	}
 #endif
 
@@ -4396,11 +4387,7 @@
 	UpdateAudioWarnings();
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 void OBSBasicSettings::HideOBSWindowWarning(Qt::CheckState state)
-#else
-void OBSBasicSettings::HideOBSWindowWarning(int state)
-#endif
 {
 	if (loading || state == Qt::Unchecked) {
 		return;
@@ -4768,29 +4755,6 @@
 	}
 }
 
-#if defined(__APPLE__) && QT_VERSION < QT_VERSION_CHECK(6, 5, 1)
-// Workaround for QTBUG-56064 on macOS
-static void ResetInvalidSelection(QComboBox *cbox)
-{
-	int idx = cbox->currentIndex();
-	if (idx < 0) {
-		return;
-	}
-
-	QStandardItemModel *model = dynamic_cast<QStandardItemModel *>(cbox->model());
-	QStandardItem *item = model->item(idx);
-
-	if (item->isEnabled()) {
-		return;
-	}
-
-	// Reset to "invalid" state if item was disabled
-	cbox->blockSignals(true);
-	cbox->setCurrentIndex(-1);
-	cbox->blockSignals(false);
-}
-#endif
-
 void OBSBasicSettings::AdvOutRecCheckWarnings()
 {
 	auto Checked = (QCheckBox *box) {
@@ -4834,12 +4798,6 @@
 		ui->autoRemux->setText(QTStr("Basic.Settings.Advanced.AutoRemux").arg("mp4"));
 	}
 
-#if defined(__APPLE__) && QT_VERSION < QT_VERSION_CHECK(6, 5, 1)
-	// Workaround for QTBUG-56064 on macOS
-	ResetInvalidSelection(ui->advOutRecEncoder);
-	ResetInvalidSelection(ui->advOutRecAEncoder);
-#endif
-
 	// Show warning if codec selection was reset to an invalid state
 	if (ui->advOutRecEncoder->currentIndex() == -1 || ui->advOutRecAEncoder->currentIndex() == -1) {
 		if (!warningMsg.isEmpty()) {

obs-studio-33.0.0~beta5.tar.xz/frontend/settings/OBSBasicSettings.hpp -> obs-studio-33.0.0~beta6.tar.xz/frontend/settings/OBSBasicSettings.hpp Changed

obs-studio-33.0.0~beta5.tar.xz/frontend/utility/RemoteTextThread.cpp -> obs-studio-33.0.0~beta6.tar.xz/frontend/utility/RemoteTextThread.cpp Changed

obs-studio-33.0.0~beta5.tar.xz/frontend/utility/WhatsNewInfoThread.cpp -> obs-studio-33.0.0~beta6.tar.xz/frontend/utility/WhatsNewInfoThread.cpp Changed

obs-studio-33.0.0~beta5.tar.xz/frontend/utility/item-widget-helpers.cpp -> obs-studio-33.0.0~beta6.tar.xz/frontend/utility/item-widget-helpers.cpp Changed

obs-studio-33.0.0~beta5.tar.xz/frontend/widgets/OBSBasic.cpp -> obs-studio-33.0.0~beta6.tar.xz/frontend/widgets/OBSBasic.cpp Changed

obs-studio-33.0.0~beta5.tar.xz/frontend/widgets/OBSBasic_Canvases.cpp -> obs-studio-33.0.0~beta6.tar.xz/frontend/widgets/OBSBasic_Canvases.cpp Changed

obs-studio-33.0.0~beta5.tar.xz/frontend/widgets/OBSBasic_MainControls.cpp -> obs-studio-33.0.0~beta6.tar.xz/frontend/widgets/OBSBasic_MainControls.cpp Changed

obs-studio-33.0.0~beta5.tar.xz/frontend/widgets/OBSBasic_SceneItems.cpp -> obs-studio-33.0.0~beta6.tar.xz/frontend/widgets/OBSBasic_SceneItems.cpp Changed

@@ -199,7 +199,7 @@
 
 void OBSBasic::SourceCreated(void *data, calldata_t *params)
 {
-	obs_source_t *source = (obs_source_t *)calldata_ptr(params, "source");
+	OBSSource source = (obs_source_t *)calldata_ptr(params, "source");
 
 	if (obs_scene_from_source(source) != NULL) {
 		QMetaObject::invokeMethod(static_cast<OBSBasic *>(data), &OBSBasic::AddScene, WaitConnection(), source);
@@ -208,7 +208,7 @@
 
 void OBSBasic::SourceRemoved(void *data, calldata_t *params)
 {
-	obs_source_t *source = (obs_source_t *)calldata_ptr(params, "source");
+	OBSSource source = (obs_source_t *)calldata_ptr(params, "source");
 
 	if (obs_scene_from_source(source) != NULL) {
 		QMetaObject::invokeMethod(static_cast<OBSBasic *>(data), &OBSBasic::RemoveScene, source);
@@ -217,7 +217,7 @@
 
 void OBSBasic::SourceRenamed(void *data, calldata_t *params)
 {
-	obs_source_t *source = (obs_source_t *)calldata_ptr(params, "source");
+	OBSSource source = (obs_source_t *)calldata_ptr(params, "source");
 	const char *newName = calldata_string(params, "new_name");
 	const char *prevName = calldata_string(params, "prev_name");

obs-studio-33.0.0~beta5.tar.xz/frontend/widgets/OBSQTDisplay.cpp -> obs-studio-33.0.0~beta6.tar.xz/frontend/widgets/OBSQTDisplay.cpp Changed

obs-studio-33.0.0~beta5.tar.xz/libobs/CMakeLists.txt -> obs-studio-33.0.0~beta6.tar.xz/libobs/CMakeLists.txt Changed

obs-studio-33.0.0~beta5.tar.xz/libobs/cmake/obs-core-modules.cmake -> obs-studio-33.0.0~beta6.tar.xz/libobs/cmake/obs-core-modules.cmake Changed

obs-studio-33.0.0~beta5.tar.xz/plugins/decklink/linux/platform.cpp -> obs-studio-33.0.0~beta6.tar.xz/plugins/decklink/linux/platform.cpp Changed

obs-studio-33.0.0~beta5.tar.xz/plugins/frontend-tools/data/scripts/clock-source.lua -> obs-studio-33.0.0~beta6.tar.xz/plugins/frontend-tools/data/scripts/clock-source.lua Changed

@@ -7,13 +7,13 @@
 
 function image_source_load(image, file)
 	obs.obs_enter_graphics();
-	obs.gs_image_file_free(image);
+	obs.gs_image_file_ex_free(image);
 	obs.obs_leave_graphics();
 
-	obs.gs_image_file_init(image, file);
+	obs.gs_image_file_ex_init(image, file, obs.GS_IMAGE_ALPHA_STRAIGHT);
 
 	obs.obs_enter_graphics();
-	obs.gs_image_file_init_texture(image);
+	obs.gs_image_file_ex_init_texture(image);
 	obs.obs_leave_graphics();
 
 	if not image.loaded then
@@ -27,10 +27,10 @@
 
 source_def.create = function(source, settings)
 	local data = {}
-	data.image = obs.gs_image_file()
-	data.hour_image = obs.gs_image_file()
-	data.minute_image = obs.gs_image_file()
-	data.second_image = obs.gs_image_file()
+	data.image = obs.gs_image_file_ex()
+	data.hour_image = obs.gs_image_file_ex()
+	data.minute_image = obs.gs_image_file_ex()
+	data.second_image = obs.gs_image_file_ex()
 
 	image_source_load(data.image, script_path() .. "clock-source/dial.png")
 	image_source_load(data.hour_image, script_path() .. "clock-source/hour.png")
@@ -42,10 +42,10 @@
 
 source_def.destroy = function(data)
 	obs.obs_enter_graphics();
-	obs.gs_image_file_free(data.image);
-	obs.gs_image_file_free(data.hour_image);
-	obs.gs_image_file_free(data.minute_image);
-	obs.gs_image_file_free(data.second_image);
+	obs.gs_image_file_ex_free(data.image);
+	obs.gs_image_file_ex_free(data.hour_image);
+	obs.gs_image_file_ex_free(data.minute_image);
+	obs.gs_image_file_ex_free(data.second_image);
 	obs.obs_leave_graphics();
 end

obs-studio-33.0.0~beta5.tar.xz/plugins/linux-v4l2/CMakeLists.txt -> obs-studio-33.0.0~beta6.tar.xz/plugins/linux-v4l2/CMakeLists.txt Changed

obs-studio-33.0.0~beta5.tar.xz/plugins/linux-v4l2/v4l2-decoder.c -> obs-studio-33.0.0~beta6.tar.xz/plugins/linux-v4l2/v4l2-decoder.c Changed

obs-studio-33.0.0~beta5.tar.xz/plugins/obs-ffmpeg/ffmpeg-mux/CMakeLists.txt -> obs-studio-33.0.0~beta6.tar.xz/plugins/obs-ffmpeg/ffmpeg-mux/CMakeLists.txt Changed

obs-studio-33.0.0~beta5.tar.xz/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c -> obs-studio-33.0.0~beta6.tar.xz/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c Changed

obs-studio-33.0.0~beta5.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c -> obs-studio-33.0.0~beta6.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c Changed

obs-studio-33.0.0~beta5.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c -> obs-studio-33.0.0~beta6.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-mpegts.c Changed

obs-studio-33.0.0~beta5.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-output.c -> obs-studio-33.0.0~beta6.tar.xz/plugins/obs-ffmpeg/obs-ffmpeg-output.c Changed

obs-studio-33.0.0~beta5.tar.xz/plugins/obs-websocket/.github/workflows/crowdin_upload.yml -> obs-studio-33.0.0~beta6.tar.xz/plugins/obs-websocket/.github/workflows/crowdin_upload.yml Changed

obs-studio-33.0.0~beta5.tar.xz/plugins/obs-websocket/.github/workflows/generate_docs.yml -> obs-studio-33.0.0~beta6.tar.xz/plugins/obs-websocket/.github/workflows/generate_docs.yml Changed

obs-studio-33.0.0~beta5.tar.xz/plugins/obs-websocket/.github/workflows/lint.yml -> obs-studio-33.0.0~beta6.tar.xz/plugins/obs-websocket/.github/workflows/lint.yml Changed

obs-studio-33.0.0~beta5.tar.xz/plugins/obs-websocket/CMakeLists.txt -> obs-studio-33.0.0~beta6.tar.xz/plugins/obs-websocket/CMakeLists.txt Changed

obs-studio-33.0.0~beta5.tar.xz/plugins/obs-websocket/README.md -> obs-studio-33.0.0~beta6.tar.xz/plugins/obs-websocket/README.md Changed

@@ -3,7 +3,7 @@
 # obs-websocket
 
 <p align="center">
-  <img src="/.github/images/obsws_logo.png" width=150 align="center">
+  <img src="/.github/images/obsws_logo.png" alt="OBS WebSocket logo" width=150 align="center">
 </p>
 
 WebSocket API for OBS Studio.
@@ -75,19 +75,19 @@
 
 #### Individuals
 
-<a href="https://opencollective.com/obs-websocket-dev"><img src="https://opencollective.com/obs-websocket-dev/individuals.svg?width=890"></a>
+<a href="https://opencollective.com/obs-websocket-dev"><img src="https://opencollective.com/obs-websocket-dev/individuals.svg?width=890" alt="Individual contributors to obs-websocket-dev on Open Collective"></a>
 
 #### Organizations
 
 Support this project with your organization. Your logo will show up here with a link to your website. Contribute(https://opencollective.com/obs-websocket-dev/contribute)
 
-<a href="https://opencollective.com/obs-websocket-dev/organization/0/website"><img src="https://opencollective.com/obs-websocket-dev/organization/0/avatar.svg"></a>
-<a href="https://opencollective.com/obs-websocket-dev/organization/1/website"><img src="https://opencollective.com/obs-websocket-dev/organization/1/avatar.svg"></a>
-<a href="https://opencollective.com/obs-websocket-dev/organization/2/website"><img src="https://opencollective.com/obs-websocket-dev/organization/2/avatar.svg"></a>
-<a href="https://opencollective.com/obs-websocket-dev/organization/3/website"><img src="https://opencollective.com/obs-websocket-dev/organization/3/avatar.svg"></a>
-<a href="https://opencollective.com/obs-websocket-dev/organization/4/website"><img src="https://opencollective.com/obs-websocket-dev/organization/4/avatar.svg"></a>
-<a href="https://opencollective.com/obs-websocket-dev/organization/5/website"><img src="https://opencollective.com/obs-websocket-dev/organization/5/avatar.svg"></a>
-<a href="https://opencollective.com/obs-websocket-dev/organization/6/website"><img src="https://opencollective.com/obs-websocket-dev/organization/6/avatar.svg"></a>
-<a href="https://opencollective.com/obs-websocket-dev/organization/7/website"><img src="https://opencollective.com/obs-websocket-dev/organization/7/avatar.svg"></a>
-<a href="https://opencollective.com/obs-websocket-dev/organization/8/website"><img src="https://opencollective.com/obs-websocket-dev/organization/8/avatar.svg"></a>
-<a href="https://opencollective.com/obs-websocket-dev/organization/9/website"><img src="https://opencollective.com/obs-websocket-dev/organization/9/avatar.svg"></a>
+<a href="https://opencollective.com/obs-websocket-dev/organization/0/website"><img src="https://opencollective.com/obs-websocket-dev/organization/0/avatar.svg" alt="OBS WebSocket supporting organization 0"></a>
+<a href="https://opencollective.com/obs-websocket-dev/organization/1/website"><img src="https://opencollective.com/obs-websocket-dev/organization/1/avatar.svg" alt="OBS WebSocket supporting organization 1"></a>
+<a href="https://opencollective.com/obs-websocket-dev/organization/2/website"><img src="https://opencollective.com/obs-websocket-dev/organization/2/avatar.svg" alt="OBS WebSocket supporting organization 2"></a>
+<a href="https://opencollective.com/obs-websocket-dev/organization/3/website"><img src="https://opencollective.com/obs-websocket-dev/organization/3/avatar.svg" alt="OBS WebSocket supporting organization 3"></a>
+<a href="https://opencollective.com/obs-websocket-dev/organization/4/website"><img src="https://opencollective.com/obs-websocket-dev/organization/4/avatar.svg" alt="OBS WebSocket supporting organization 4"></a>
+<a href="https://opencollective.com/obs-websocket-dev/organization/5/website"><img src="https://opencollective.com/obs-websocket-dev/organization/5/avatar.svg" alt="OBS WebSocket supporting organization 5"></a>
+<a href="https://opencollective.com/obs-websocket-dev/organization/6/website"><img src="https://opencollective.com/obs-websocket-dev/organization/6/avatar.svg" alt="OBS WebSocket supporting organization 6"></a>
+<a href="https://opencollective.com/obs-websocket-dev/organization/7/website"><img src="https://opencollective.com/obs-websocket-dev/organization/7/avatar.svg" alt="OBS WebSocket supporting organization 7"></a>
+<a href="https://opencollective.com/obs-websocket-dev/organization/8/website"><img src="https://opencollective.com/obs-websocket-dev/organization/8/avatar.svg" alt="OBS WebSocket supporting organization 8"></a>
+<a href="https://opencollective.com/obs-websocket-dev/organization/9/website"><img src="https://opencollective.com/obs-websocket-dev/organization/9/avatar.svg" alt="OBS WebSocket supporting organization 9"></a>

obs-studio-33.0.0~beta5.tar.xz/plugins/obs-websocket/data/locale/en-US.ini -> obs-studio-33.0.0~beta6.tar.xz/plugins/obs-websocket/data/locale/en-US.ini Changed

obs-studio-33.0.0~beta5.tar.xz/plugins/obs-websocket/docs/docs/generate_md.py -> obs-studio-33.0.0~beta6.tar.xz/plugins/obs-websocket/docs/docs/generate_md.py Changed

obs-studio-33.0.0~beta5.tar.xz/plugins/obs-websocket/docs/generated/protocol.md -> obs-studio-33.0.0~beta6.tar.xz/plugins/obs-websocket/docs/generated/protocol.md Changed

@@ -2663,7 +2663,7 @@
 
 ## Requests Table of Contents
 
-- General Requests(#general-1-requests)
+- General Requests(#general-requests)
   - GetVersion(#getversion)
   - GetStats(#getstats)
   - BroadcastCustomEvent(#broadcastcustomevent)
@@ -2672,7 +2672,7 @@
   - TriggerHotkeyByName(#triggerhotkeybyname)
   - TriggerHotkeyByKeySequence(#triggerhotkeybykeysequence)
   - Sleep(#sleep)
-- Config Requests(#config-1-requests)
+- Config Requests(#config-requests)
   - GetPersistentData(#getpersistentdata)
   - SetPersistentData(#setpersistentdata)
   - GetSceneCollectionList(#getscenecollectionlist)
@@ -2694,9 +2694,9 @@
   - GetSourceActive(#getsourceactive)
   - GetSourceScreenshot(#getsourcescreenshot)
   - SaveSourceScreenshot(#savesourcescreenshot)
-- Canvases Requests(#canvases-1-requests)
+- Canvases Requests(#canvases-requests)
   - GetCanvasList(#getcanvaslist)
-- Scenes Requests(#scenes-1-requests)
+- Scenes Requests(#scenes-requests)
   - GetSceneList(#getscenelist)
   - GetGroupList(#getgrouplist)
   - GetCurrentProgramScene(#getcurrentprogramscene)
@@ -2708,7 +2708,7 @@
   - SetSceneName(#setscenename)
   - GetSceneSceneTransitionOverride(#getscenescenetransitionoverride)
   - SetSceneSceneTransitionOverride(#setscenescenetransitionoverride)
-- Inputs Requests(#inputs-1-requests)
+- Inputs Requests(#inputs-requests)
   - GetInputList(#getinputlist)
   - GetInputKindList(#getinputkindlist)
   - GetSpecialInputs(#getspecialinputs)
@@ -2737,7 +2737,7 @@
   - SetInputDeinterlaceFieldOrder(#setinputdeinterlacefieldorder)
   - GetInputPropertiesListPropertyItems(#getinputpropertieslistpropertyitems)
   - PressInputPropertiesButton(#pressinputpropertiesbutton)
-- Transitions Requests(#transitions-1-requests)
+- Transitions Requests(#transitions-requests)
   - GetTransitionKindList(#gettransitionkindlist)
   - GetSceneTransitionList(#getscenetransitionlist)
   - GetCurrentSceneTransition(#getcurrentscenetransition)
@@ -2747,7 +2747,7 @@
   - GetCurrentSceneTransitionCursor(#getcurrentscenetransitioncursor)
   - TriggerStudioModeTransition(#triggerstudiomodetransition)
   - SetTBarPosition(#settbarposition)
-- Filters Requests(#filters-1-requests)
+- Filters Requests(#filters-requests)
   - GetSourceFilterKindList(#getsourcefilterkindlist)
   - GetSourceFilterList(#getsourcefilterlist)
   - GetSourceFilterDefaultSettings(#getsourcefilterdefaultsettings)
@@ -2758,7 +2758,7 @@
   - SetSourceFilterIndex(#setsourcefilterindex)
   - SetSourceFilterSettings(#setsourcefiltersettings)
   - SetSourceFilterEnabled(#setsourcefilterenabled)
-- Scene Items Requests(#scene-items-1-requests)
+- Scene Items Requests(#scene-items-requests)
   - GetSceneItemList(#getsceneitemlist)
   - GetGroupSceneItemList(#getgroupsceneitemlist)
   - GetSceneItemId(#getsceneitemid)
@@ -2776,7 +2776,7 @@
   - SetSceneItemIndex(#setsceneitemindex)
   - GetSceneItemBlendMode(#getsceneitemblendmode)
   - SetSceneItemBlendMode(#setsceneitemblendmode)
-- Outputs Requests(#outputs-1-requests)
+- Outputs Requests(#outputs-requests)
   - GetVirtualCamStatus(#getvirtualcamstatus)
   - ToggleVirtualCam(#togglevirtualcam)
   - StartVirtualCam(#startvirtualcam)
@@ -2810,12 +2810,12 @@
   - ResumeRecord(#resumerecord)
   - SplitRecordFile(#splitrecordfile)
   - CreateRecordChapter(#createrecordchapter)
-- Media Inputs Requests(#media-inputs-1-requests)
+- Media Inputs Requests(#media-inputs-requests)
   - GetMediaInputStatus(#getmediainputstatus)
   - SetMediaInputCursor(#setmediainputcursor)
   - OffsetMediaInputCursor(#offsetmediainputcursor)
   - TriggerMediaInputAction(#triggermediainputaction)
-- Ui Requests(#ui-1-requests)
+- Ui Requests(#ui-requests)
   - GetStudioModeEnabled(#getstudiomodeenabled)
   - SetStudioModeEnabled(#setstudiomodeenabled)
   - OpenInputPropertiesDialog(#openinputpropertiesdialog)

obs-studio-33.0.0~beta5.tar.xz/plugins/obs-websocket/src/forms/SettingsDialog.cpp -> obs-studio-33.0.0~beta6.tar.xz/plugins/obs-websocket/src/forms/SettingsDialog.cpp Changed

@@ -48,6 +48,18 @@
 	ui->websocketSessionTable->horizontalHeader()->resizeSection(3, 100); // Resize Session Table column widths
 	ui->websocketSessionTable->horizontalHeader()->resizeSection(4, 100);
 
+	if (obs_frontend_is_safe_mode_enabled()) {
+		QFrame *safeModeFrame = new QFrame(this);
+		safeModeFrame->setProperty("class", "frame-notice");
+
+		safeModeFrame->setLayout(new QHBoxLayout);
+		safeModeFrame->layout()->setContentsMargins(0, 0, 0, 0);
+		QLabel *safeModeText = new QLabel(obs_module_text("OBSWebSocket.Settings.SafeModeWarning"), safeModeFrame);
+		safeModeText->setWordWrap(true);
+		safeModeFrame->layout()->addWidget(safeModeText);
+		ui->verticalLayout->insertWidget(0, safeModeFrame);
+	}
+
 	// Remove the ? button on dialogs on Windows
 	setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
@@ -56,13 +68,8 @@
 
 	connect(sessionTableTimer, &QTimer::timeout, this, &SettingsDialog::FillSessionTable);
 	connect(ui->buttonBox, &QDialogButtonBox::clicked, this, &SettingsDialog::DialogButtonClicked);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
 	connect(ui->enableAuthenticationCheckBox, &QCheckBox::checkStateChanged, this,
 		&SettingsDialog::EnableAuthenticationCheckBoxChanged);
-#else
-	connect(ui->enableAuthenticationCheckBox, &QCheckBox::stateChanged, this,
-		&SettingsDialog::EnableAuthenticationCheckBoxChanged);
-#endif
 	connect(ui->generatePasswordButton, &QPushButton::clicked, this, &SettingsDialog::GeneratePasswordButtonClicked);
 	connect(ui->showConnectInfoButton, &QPushButton::clicked, this, &SettingsDialog::ShowConnectInfoButtonClicked);
 	connect(ui->serverPasswordLineEdit, &QLineEdit::textEdited, this, &SettingsDialog::PasswordEdited);
@@ -123,7 +130,11 @@
 		return;
 	}
 
-	ui->enableWebSocketServerCheckBox->setChecked(conf->ServerEnabled);
+	if (IsServerOffBySafeMode()) {
+		ui->enableWebSocketServerCheckBox->setChecked(false);
+	} else {
+		ui->enableWebSocketServerCheckBox->setChecked(conf->ServerEnabled);
+	}
 	ui->enableSystemTrayAlertsCheckBox->setChecked(conf->AlertsEnabled);
 	ui->enableDebugLoggingCheckBox->setChecked(conf->DebugEnabled);
 	ui->serverPortSpinBox->setValue(conf->ServerPort);
@@ -182,6 +193,8 @@
 		}
 	}
 
+	ClearServerOffBySafeMode();
+
 	bool needsRestart = (conf->ServerEnabled != ui->enableWebSocketServerCheckBox->isChecked()) ||
 			    (conf->ServerPort != ui->serverPortSpinBox->value()) ||
 			    (ui->enableAuthenticationCheckBox->isChecked() &&

obs-studio-33.0.0~beta5.tar.xz/plugins/obs-websocket/src/obs-websocket.cpp -> obs-studio-33.0.0~beta6.tar.xz/plugins/obs-websocket/src/obs-websocket.cpp Changed

@@ -47,6 +47,7 @@
 WebSocketApiPtr _webSocketApi;
 WebSocketServerPtr _webSocketServer;
 SettingsDialog *_settingsDialog = nullptr;
+static bool _serverOffBySafeMode = false;
 
 void OnWebSocketApiVendorEvent(std::string vendorName, std::string eventType, obs_data_t *obsEventData);
 void OnEvent(uint64_t requiredIntent, std::string eventType, json eventData, uint8_t rpcVersion);
@@ -116,6 +117,13 @@
 	test_register_vendor();
 #endif
 
+	if (obs_frontend_is_safe_mode_enabled()) {
+		_serverOffBySafeMode = true;
+		if (_config->ServerEnabled)
+			blog(LOG_INFO, "obs_module_post_load OBS is in Safe Mode. WebSocket server will not be started.");
+		return;
+	}
+
 	// Server will accept clients, but requests and events will not be served until FINISHED_LOADING occurs
 	if (_config->ServerEnabled) {
 		blog(LOG_INFO, "obs_module_post_load WebSocket server is enabled, starting...");
@@ -184,6 +192,16 @@
 	return !_config || _config->DebugEnabled;
 }
 
+bool IsServerOffBySafeMode()
+{
+	return _serverOffBySafeMode;
+}
+
+void ClearServerOffBySafeMode()
+{
+	_serverOffBySafeMode = false;
+}
+
 /**
  * An event has been emitted from a vendor. 
  *

obs-studio-33.0.0~beta5.tar.xz/plugins/obs-websocket/src/obs-websocket.h -> obs-studio-33.0.0~beta6.tar.xz/plugins/obs-websocket/src/obs-websocket.h Changed

obs-studio-33.0.0~beta5.tar.xz/plugins/win-capture/game-capture-file-init.c -> obs-studio-33.0.0~beta6.tar.xz/plugins/win-capture/game-capture-file-init.c Changed

obs-studio-33.0.0~beta5.tar.xz/plugins/win-dshow/CMakeLists.txt -> obs-studio-33.0.0~beta6.tar.xz/plugins/win-dshow/CMakeLists.txt Changed

obs-studio-33.0.0~beta5.tar.xz/shared/media-playback/CMakeLists.txt -> obs-studio-33.0.0~beta6.tar.xz/shared/media-playback/CMakeLists.txt Changed

obs-studio-33.0.0~beta5.tar.xz/shared/properties-view/properties-view.cpp -> obs-studio-33.0.0~beta6.tar.xz/shared/properties-view/properties-view.cpp Changed

Changes of Revision 8