OBS merge 31.0.3

CMakeLists.txt

@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 3.16...3.25)
 
-legacy_check()
-
-set(obs-websocket_VERSION 5.5.2)
+set(obs-websocket_VERSION 5.5.6)
 set(OBS_WEBSOCKET_RPC_VERSION 1)
 
 include(cmake/obs-websocket-api.cmake)
@@ -138,12 +136,14 @@ target_compile_definitions(
 target_compile_options(
   obs-websocket
   PRIVATE $<$<PLATFORM_ID:Windows>:/wd4267>
+          $<$<PLATFORM_ID:Windows>:/wd4996>
           $<$<COMPILE_LANG_AND_ID:CXX,GNU,AppleClang,Clang>:-Wall>
           $<$<COMPILE_LANG_AND_ID:CXX,GNU,AppleClang,Clang>:-Wno-error=float-conversion>
           $<$<COMPILE_LANG_AND_ID:CXX,GNU,AppleClang,Clang>:-Wno-error=shadow>
           $<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wno-error=format-overflow>
           $<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wno-error=int-conversion>
           $<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wno-error=comment>
+          $<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wno-error=deprecated-declarations>
           $<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wno-error=null-pointer-subtraction>
           $<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wno-error=deprecated-declarations>
           $<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wno-error=implicit-int-conversion>

data/locale/de-DE.ini

@@ -31,7 +31,7 @@ OBSWebSocket.ConnectInfo.CopyText="Kopieren"
 OBSWebSocket.ConnectInfo.ServerIp="Server-IP (Geschätzt)"
 OBSWebSocket.ConnectInfo.ServerPort="Serverport"
 OBSWebSocket.ConnectInfo.ServerPassword="Serverpasswort"
-OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="Authentifizierung deaktiviert"
+OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Authentifizierung deaktiviert]"
 OBSWebSocket.ConnectInfo.QrTitle="QR-Code zum Verbinden"
 OBSWebSocket.TrayNotification.Identified.Title="Neue WebSocket-Verbindung"
 OBSWebSocket.TrayNotification.Identified.Body="Client %1 identifiziert."

data/locale/gl-ES.ini

@@ -1,6 +1,41 @@
+OBSWebSocket.Plugin.Description="Control remoto de OBS Studio a través de WebSocket"
+OBSWebSocket.Settings.DialogTitle="Configuración do servidor WebSocket"
+OBSWebSocket.Settings.PluginSettingsTitle="Configuración do complemento"
+OBSWebSocket.Settings.ServerEnable="Activar servidor WebSocket"
+OBSWebSocket.Settings.AlertsEnable="Activar alertas na bandexa do sistema"
+OBSWebSocket.Settings.DebugEnable="Activar rexistro de depuración"
+OBSWebSocket.Settings.DebugEnableHoverText="Activa o rexistro de depuración para a instancia actual de OBS. Non se mantén ao cargar. Usa --websocket_debug para activar ao cargar."
 OBSWebSocket.Settings.ServerSettingsTitle="Configuración do servidor"
+OBSWebSocket.Settings.AuthRequired="Activar autenticación"
+OBSWebSocket.Settings.Password="Contrasinal do servidor"
+OBSWebSocket.Settings.GeneratePassword="Xerar contrasinal"
+OBSWebSocket.Settings.ServerPort="Porto do Servidor"
+OBSWebSocket.Settings.ShowConnectInfo="Mostrar información de conexión"
+OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Advertencia: Actualmente en directo"
+OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Parece que un saída (transmisión, gravación, etc.) está actualmente activa."
+OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Estás seguro de que queres mostrar a túa información de conexión?"
+OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Advertencia: Posible problema de seguridade"
+OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket almacena o contrasinal do servidor en texto plano. Recoméndase encarecidamente utilizar un contrasinal xenerado por obs-websocket."
+OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Estás seguro de que desexas usar o teu propio contrasinal?"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Erro: configuración non válida"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Debes usar un contrasinal de 6 ou máis caracteres."
+OBSWebSocket.SessionTable.Title="Sesións WebSocket conectadas"
+OBSWebSocket.SessionTable.RemoteAddressColumnTitle="Enderezo remoto"
+OBSWebSocket.SessionTable.SessionDurationColumnTitle="Duración da sesión"
+OBSWebSocket.SessionTable.MessagesInOutColumnTitle="Mensaxes de entrada/saída"
+OBSWebSocket.SessionTable.IdentifiedTitle="Identificado"
+OBSWebSocket.SessionTable.KickButtonColumnTitle="Expulsar?"
+OBSWebSocket.SessionTable.KickButtonText="Expulsar"
+OBSWebSocket.ConnectInfo.DialogTitle="Información de conexión de WebSocket"
 OBSWebSocket.ConnectInfo.CopyText="Copiar"
+OBSWebSocket.ConnectInfo.ServerIp="IP do servidor (a mellor proposta)"
 OBSWebSocket.ConnectInfo.ServerPort="Porto do Servidor"
 OBSWebSocket.ConnectInfo.ServerPassword="Contrasinal do Servidor"
+OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Autenticación Desactivada]"
+OBSWebSocket.ConnectInfo.QrTitle="Conectar con QR"
+OBSWebSocket.TrayNotification.Identified.Title="Nova conexión WebSocket"
 OBSWebSocket.TrayNotification.Identified.Body="Cliente %1 identificado."
+OBSWebSocket.TrayNotification.AuthenticationFailed.Title="Fallo na autenticación do WebSocket"
+OBSWebSocket.TrayNotification.AuthenticationFailed.Body="O cliente %1 fallou na autenticación."
+OBSWebSocket.TrayNotification.Disconnected.Title="Cliente WebSocket desconectado."
 OBSWebSocket.TrayNotification.Disconnected.Body="Cliente %1 desconectado."

data/locale/ja-JP.ini

@@ -22,7 +22,7 @@ OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="6文字以上のパス
 OBSWebSocket.SessionTable.Title="接続されているWebSocketセッション"
 OBSWebSocket.SessionTable.RemoteAddressColumnTitle="リモートアドレス"
 OBSWebSocket.SessionTable.SessionDurationColumnTitle="セッション時間"
-OBSWebSocket.SessionTable.MessagesInOutColumnTitle="メッセージ In/Out"
+OBSWebSocket.SessionTable.MessagesInOutColumnTitle="メッセージ 受信/送信"
 OBSWebSocket.SessionTable.IdentifiedTitle="識別"
 OBSWebSocket.SessionTable.KickButtonColumnTitle="キック？"
 OBSWebSocket.SessionTable.KickButtonText="キック"

data/locale/ru-RU.ini

@@ -15,7 +15,7 @@ OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Предупреждение:
 OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Похоже, что вывод (поток, запись и т. д.) в настоящее время уже выбран."
 OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Уверены, что хотите показать ваши сведения о подключении?"
 OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Предупреждение: Потенциальная проблема безопасности"
-OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket хранит пароль сервера в виде обычного текста. Настоятельно рекомендуется использовать пароль, сгенерированный obs-websock."
+OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket хранит пароль сервера в виде обычного текста. Настоятельно рекомендуется использовать пароль, созданный obs-websocket."
 OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Уверены, что хотите использовать собственый пароль?"
 OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Ошибка: Неверная конфигурация"
 OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Вы должны использовать пароль длиной 6 или более символов."

data/locale/tt-RU.ini

@@ -7,3 +7,4 @@ OBSWebSocket.SessionTable.KickButtonText="Чыгару"
 OBSWebSocket.ConnectInfo.CopyText="Күчермә алу"
 OBSWebSocket.ConnectInfo.ServerPort="Сервер порты"
 OBSWebSocket.ConnectInfo.ServerPassword="Сервер серсүзе"
+OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket клиенты өзелде"

data/locale/ug-CN.ini

@@ -1,2 +1,41 @@
+OBSWebSocket.Plugin.Description="WebSocket ئارقىلىق OBS Studio نى يىراقتىن تىزگىنلەش"
+OBSWebSocket.Settings.DialogTitle="WebSocket مۇلازىمېتىر تەڭشىكى"
+OBSWebSocket.Settings.PluginSettingsTitle="قىستۇرما تەڭشىكى"
+OBSWebSocket.Settings.ServerEnable="WebSocket مۇلازىمېتىرنى قوزغىتىدۇ"
+OBSWebSocket.Settings.AlertsEnable="سىستېما قورال تاختا ئاگاھلاندۇرۇشىنى قوزغىتىدۇ"
+OBSWebSocket.Settings.DebugEnable="سازلاش خاتىرىسىنى قوزغىتىدۇ"
+OBSWebSocket.Settings.DebugEnableHoverText="نۆۋەتتىكى OBS ئەمەلىي مىسالىنىڭ سازلاش خاتىرىسىنى قوزغىتىدۇ. كېيىنكى قېتىم يۈكلىگەندە قايتا تەڭشەش كېرەك.\n --websocket_debug ئىشلىتىلسە OBS نى يۈكلىگەندە كۈندىلىك خاتىرىنى قوزغىتىدۇ."
+OBSWebSocket.Settings.ServerSettingsTitle="مۇلازىمېتىر تەڭشىكى"
+OBSWebSocket.Settings.AuthRequired="كىملىك دەلىللەشنى قوزغىتىدۇ"
+OBSWebSocket.Settings.Password="مۇلازىمېتىر ئىم"
 OBSWebSocket.Settings.GeneratePassword="ئىم ھاسىللا"
+OBSWebSocket.Settings.ServerPort="مۇلازىمېتىر ئېغىزى"
+OBSWebSocket.Settings.ShowConnectInfo="باغلىنىش ئۇچۇرىنى كۆرسەت"
+OBSWebSocket.Settings.ShowConnectInfoWarningTitle="ئاگاھلاندۇرۇش: شۇئان سىن تارقىتىۋاتىدۇ"
+OBSWebSocket.Settings.ShowConnectInfoWarningMessage="قارىغاندا ئاكتىپ چىقىرىۋاتقان (ئېقىم، سىن خاتىرىلەش قاتارلىق)  باردەك قىلىدۇ."
+OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="راستتىنلا باغلىنىش ئۇچۇرىڭىزنى كۆرسىتەمسىز؟"
+OBSWebSocket.Settings.Save.UserPasswordWarningTitle="ئاگاھلاندۇرۇش: يوشۇرۇن بىخەتەرلىك مەسىلىسى"
+OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket مۇلازىمېتىر ئىمنى ساپ تېكىست ھالىتىدا ساقلايدۇ. obs-websocket نى ئىشلىتىش كۈچلۈك تەۋسىيە قىلىنىدۇ."
+OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="راستتىنلا ئۆزىڭىز بەلگىلىگەن ئىمنى ئىشلىتەمسىز؟"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="خاتالىق: ئىناۋەتسىز سەپلىمە"
+OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="ئىم ئۈچۈن كەم دېگەندە 6 ياكى ئۇنىڭدىن كۆپ ھەرپ ئىشلىتىش كېرەك."
+OBSWebSocket.SessionTable.Title="باغلانغان WebSocket سۆزلىشىشى"
+OBSWebSocket.SessionTable.RemoteAddressColumnTitle="يىراقتىكى ئادرېس"
+OBSWebSocket.SessionTable.SessionDurationColumnTitle="سۆزلىشىش داۋاملىشىش ۋاقتى"
+OBSWebSocket.SessionTable.MessagesInOutColumnTitle="ئۇچۇر كىرىش/چىقىش"
+OBSWebSocket.SessionTable.IdentifiedTitle="تونۇدى"
+OBSWebSocket.SessionTable.KickButtonColumnTitle="تېپىلەمدۇ؟"
+OBSWebSocket.SessionTable.KickButtonText="تەپ"
+OBSWebSocket.ConnectInfo.DialogTitle="WebSocket باغلىنىش ئۇچۇرى"
 OBSWebSocket.ConnectInfo.CopyText="كۆچۈر"
+OBSWebSocket.ConnectInfo.ServerIp="مۇلازىمېتىر IP (ئېھتىماللىقى يۇقىرى)"
+OBSWebSocket.ConnectInfo.ServerPort="مۇلازىمېتىر ئېغىزى"
+OBSWebSocket.ConnectInfo.ServerPassword="مۇلازىمېتىر ئىم"
+OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[دەلىللەش چەكلەنگەن]"
+OBSWebSocket.ConnectInfo.QrTitle="باغلىنىش QR كودى"
+OBSWebSocket.TrayNotification.Identified.Title="يېڭى WebSocket باغلىنىش"
+OBSWebSocket.TrayNotification.Identified.Body="خېرىدار %1 دەلىللەندى."
+OBSWebSocket.TrayNotification.AuthenticationFailed.Title="WebSocket نى دەلىللىيەلمىدى"
+OBSWebSocket.TrayNotification.AuthenticationFailed.Body="خېرىدار %1 دەلىللىيەلمىدى."
+OBSWebSocket.TrayNotification.Disconnected.Title="WebSocket باغلىنىش ئۈزۈلدى"
+OBSWebSocket.TrayNotification.Disconnected.Body="خېرىدار %1 ئۈزۈلدى."

src/eventhandler/EventHandler_Scenes.cpp

@@ -109,6 +109,9 @@ void EventHandler::HandleCurrentProgramSceneChanged()
 {
 	OBSSourceAutoRelease currentScene = obs_frontend_get_current_scene();
 
+	if (!currentScene)
+		return;
+
 	json eventData;
 	eventData["sceneName"] = obs_source_get_name(currentScene);
 	eventData["sceneUuid"] = obs_source_get_uuid(currentScene);

src/forms/SettingsDialog.cpp

@@ -56,8 +56,13 @@ SettingsDialog::SettingsDialog(QWidget *parent)
 
 	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);