Events: Add from and to scene names to transition events

These scene names are missing to make these events useful for anything other than monitoring
obsproject · Aug 8, 2024 · c21afa4 · c21afa4
1 parent 5b4aa9d
commit c21afa4
Show file tree

Hide file tree

Showing 23 changed files with 339 additions and 108 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16...3.25)
 
 legacy_check()
 
-set(obs-websocket_VERSION 5.4.2)
+set(obs-websocket_VERSION 5.5.2)
 set(OBS_WEBSOCKET_RPC_VERSION 1)
 
 include(cmake/obs-websocket-api.cmake)
@@ -138,12 +138,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>

diff --git a/cmake/legacy.cmake b/cmake/legacy.cmake
@@ -1,4 +1,4 @@
-project(obs-websocket VERSION 5.4.2)
+project(obs-websocket VERSION 5.5.2)
 set(OBS_WEBSOCKET_RPC_VERSION 1)
 
 option(ENABLE_WEBSOCKET "Enable building OBS with websocket plugin" ON)

diff --git a/data/locale/be-BY.ini b/data/locale/be-BY.ini
@@ -13,10 +13,10 @@ OBSWebSocket.Settings.ServerPort="Порт сервера"
 OBSWebSocket.Settings.ShowConnectInfo="Паказаць звесткі пра злучэнне"
 OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Увага: ідзе трансляцыя"
 OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Выглядае, што ў бягучы момант ідзе вывад (стрым, запіс і г. д.)."
-OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Вы ўпэўненыя, што хочаце паказаць вашы звесткі пра злучэнне?"
+OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Ці вы ўпэўненыя, што хочаце паказаць вашы звесткі пра злучэнне?"
 OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Увага: магчымая небяспека"
 OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket захоўвае пароль сервера ў выглядзе звычайнага тэксту. Настойліва рэкамендуецца выкарыстоўваць пароль, які згенеруе obs-websocket."
-OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Вы ўпэўненыя, што хочаце карыстацца сваім паролем?"
+OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Ці вы ўпэўненыя, што хочаце карыстацца сваім паролем?"
 OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Увага: памылковая канфігурацыя"
 OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Пароль павінен утрымліваць 6 або больш сімвалаў."
 OBSWebSocket.SessionTable.Title="Злучаныя сеансы WebSocket"

diff --git a/data/locale/ro-RO.ini b/data/locale/ro-RO.ini
@@ -12,7 +12,7 @@ OBSWebSocket.Settings.GeneratePassword="Generează parola"
 OBSWebSocket.Settings.ServerPort="Portul serverului"
 OBSWebSocket.Settings.ShowConnectInfo="Afișează informațiile conexiunii"
 OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Avertisment: În prezent în direct"
-OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Se pare că un output (transmisiune, înregistrare etc.) este activ în prezent."
+OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Se pare că un output (stream, înregistrare etc.) este activ în prezent."
 OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Sigur vrei să afișezi informațiile de conectare?"
 OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Avertisment: Potențială problemă de securitate"
 OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket stochează parola serverului ca text simplu. Este foarte recomandat să folosiți o parolă generată de obs-websocket."

diff --git a/data/locale/ru-RU.ini b/data/locale/ru-RU.ini
@@ -28,7 +28,7 @@ OBSWebSocket.SessionTable.KickButtonColumnTitle="Выгнать?"
 OBSWebSocket.SessionTable.KickButtonText="Выгнать"
 OBSWebSocket.ConnectInfo.DialogTitle="Сведения о подключении WebSocket"
 OBSWebSocket.ConnectInfo.CopyText="Копировать"
-OBSWebSocket.ConnectInfo.ServerIp="IP сервера (лучшая догадка)"
+OBSWebSocket.ConnectInfo.ServerIp="IP сервера (вероятный)"
 OBSWebSocket.ConnectInfo.ServerPort="Порт сервера"
 OBSWebSocket.ConnectInfo.ServerPassword="Пароль сервера"
 OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Вход отключён]"

diff --git a/data/locale/sv-SE.ini b/data/locale/sv-SE.ini
@@ -1,6 +1,6 @@
 OBSWebSocket.Plugin.Description="Fjärrkontroll av OBS Studio via WebSocket"
 OBSWebSocket.Settings.DialogTitle="WebSocket-serverinställningar"
-OBSWebSocket.Settings.PluginSettingsTitle="Insticksmodulsinställningar"
+OBSWebSocket.Settings.PluginSettingsTitle="Insticksprogramsinställningar"
 OBSWebSocket.Settings.ServerEnable="Aktivera WebSocket-server"
 OBSWebSocket.Settings.AlertsEnable="Aktivera systemfältsmeddelanden"
 OBSWebSocket.Settings.DebugEnable="Aktivera felsökningsloggning"
@@ -11,7 +11,7 @@ OBSWebSocket.Settings.Password="Serverlösenord"
 OBSWebSocket.Settings.GeneratePassword="Generera lösenord"
 OBSWebSocket.Settings.ServerPort="Serverport"
 OBSWebSocket.Settings.ShowConnectInfo="Visa anslutningsinformation"
-OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Varning: Sänder för närvarande"
+OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Varning: Direktsändning pågår"
 OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Det verkar som om en utmatning (ström, inspelning, etc.) är för närvarande aktiv."
 OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Är du säker på att du vill visa din anslutningsinformation?"
 OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Varning: Potentiellt säkerhetsproblem"

diff --git a/data/locale/tt-RU.ini b/data/locale/tt-RU.ini
@@ -0,0 +1,9 @@
+OBSWebSocket.Settings.ServerSettingsTitle="Сервер көйләүләре"
+OBSWebSocket.Settings.Password="Сервер серсүзе"
+OBSWebSocket.Settings.GeneratePassword="Серсүзне ясау"
+OBSWebSocket.Settings.ServerPort="Сервер порты"
+OBSWebSocket.SessionTable.KickButtonColumnTitle="Чыгарыргамы?"
+OBSWebSocket.SessionTable.KickButtonText="Чыгару"
+OBSWebSocket.ConnectInfo.CopyText="Күчермә алу"
+OBSWebSocket.ConnectInfo.ServerPort="Сервер порты"
+OBSWebSocket.ConnectInfo.ServerPassword="Сервер серсүзе"
diff --git a/docs/generated/protocol.json b/docs/generated/protocol.json
@@ -461,72 +461,72 @@
         {
           "description": "Unknown state.",
           "enumIdentifier": "OBS_WEBSOCKET_OUTPUT_UNKNOWN",
-          "rpcVersion": 1,
-          "deprecated": true,
+          "rpcVersion": "1",
+          "deprecated": false,
           "initialVersion": "5.0.0",
           "enumValue": "OBS_WEBSOCKET_OUTPUT_UNKNOWN"
         },
         {
           "description": "The output is starting.",
           "enumIdentifier": "OBS_WEBSOCKET_OUTPUT_STARTING",
-          "rpcVersion": 1,
-          "deprecated": true,
+          "rpcVersion": "1",
+          "deprecated": false,
           "initialVersion": "5.0.0",
           "enumValue": "OBS_WEBSOCKET_OUTPUT_STARTING"
         },
         {
           "description": "The input has started.",
           "enumIdentifier": "OBS_WEBSOCKET_OUTPUT_STARTED",
-          "rpcVersion": 1,
-          "deprecated": true,
+          "rpcVersion": "1",
+          "deprecated": false,
           "initialVersion": "5.0.0",
           "enumValue": "OBS_WEBSOCKET_OUTPUT_STARTED"
         },
         {
           "description": "The output is stopping.",
           "enumIdentifier": "OBS_WEBSOCKET_OUTPUT_STOPPING",
-          "rpcVersion": 1,
-          "deprecated": true,
+          "rpcVersion": "1",
+          "deprecated": false,
           "initialVersion": "5.0.0",
           "enumValue": "OBS_WEBSOCKET_OUTPUT_STOPPING"
         },
         {
           "description": "The output has stopped.",
           "enumIdentifier": "OBS_WEBSOCKET_OUTPUT_STOPPED",
-          "rpcVersion": 1,
-          "deprecated": true,
+          "rpcVersion": "1",
+          "deprecated": false,
           "initialVersion": "5.0.0",
           "enumValue": "OBS_WEBSOCKET_OUTPUT_STOPPED"
         },
         {
           "description": "The output has disconnected and is reconnecting.",
           "enumIdentifier": "OBS_WEBSOCKET_OUTPUT_RECONNECTING",
-          "rpcVersion": 1,
-          "deprecated": true,
+          "rpcVersion": "1",
+          "deprecated": false,
           "initialVersion": "5.0.0",
           "enumValue": "OBS_WEBSOCKET_OUTPUT_RECONNECTING"
         },
         {
           "description": "The output has reconnected successfully.",
           "enumIdentifier": "OBS_WEBSOCKET_OUTPUT_RECONNECTED",
-          "rpcVersion": 1,
-          "deprecated": true,
+          "rpcVersion": "1",
+          "deprecated": false,
           "initialVersion": "5.1.0",
           "enumValue": "OBS_WEBSOCKET_OUTPUT_RECONNECTED"
         },
         {
           "description": "The output is now paused.",
           "enumIdentifier": "OBS_WEBSOCKET_OUTPUT_PAUSED",
-          "rpcVersion": 1,
-          "deprecated": true,
+          "rpcVersion": "1",
+          "deprecated": false,
           "initialVersion": "5.1.0",
           "enumValue": "OBS_WEBSOCKET_OUTPUT_PAUSED"
         },
         {
           "description": "The output has been resumed (unpaused).",
           "enumIdentifier": "OBS_WEBSOCKET_OUTPUT_RESUMED",
-          "rpcVersion": 1,
-          "deprecated": true,
+          "rpcVersion": "1",
+          "deprecated": false,
           "initialVersion": "5.0.0",
           "enumValue": "OBS_WEBSOCKET_OUTPUT_RESUMED"
         }
@@ -538,56 +538,56 @@
         {
           "description": "No action.",
           "enumIdentifier": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_NONE",
-          "rpcVersion": 1,
-          "deprecated": true,
+          "rpcVersion": "1",
+          "deprecated": false,
           "initialVersion": "5.0.0",
           "enumValue": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_NONE"
         },
         {
           "description": "Play the media input.",
           "enumIdentifier": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PLAY",
-          "rpcVersion": 1,
-          "deprecated": true,
+          "rpcVersion": "1",
+          "deprecated": false,
           "initialVersion": "5.0.0",
           "enumValue": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PLAY"
         },
         {
           "description": "Pause the media input.",
           "enumIdentifier": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PAUSE",
-          "rpcVersion": 1,
-          "deprecated": true,
+          "rpcVersion": "1",
+          "deprecated": false,
           "initialVersion": "5.0.0",
           "enumValue": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PAUSE"
         },
         {
           "description": "Stop the media input.",
           "enumIdentifier": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_STOP",
-          "rpcVersion": 1,
-          "deprecated": true,
+          "rpcVersion": "1",
+          "deprecated": false,
           "initialVersion": "5.0.0",
           "enumValue": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_STOP"
         },
         {
           "description": "Restart the media input.",
           "enumIdentifier": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_RESTART",
-          "rpcVersion": 1,
-          "deprecated": true,
+          "rpcVersion": "1",
+          "deprecated": false,
           "initialVersion": "5.0.0",
           "enumValue": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_RESTART"
         },
         {
           "description": "Go to the next playlist item.",
           "enumIdentifier": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_NEXT",
-          "rpcVersion": 1,
-          "deprecated": true,
+          "rpcVersion": "1",
+          "deprecated": false,
           "initialVersion": "5.0.0",
           "enumValue": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_NEXT"
         },
         {
           "description": "Go to the previous playlist item.",
           "enumIdentifier": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PREVIOUS",
-          "rpcVersion": 1,
-          "deprecated": true,
+          "rpcVersion": "1",
+          "deprecated": false,
           "initialVersion": "5.0.0",
           "enumValue": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PREVIOUS"
         }
@@ -3472,6 +3472,37 @@
       "requestFields": [],
       "responseFields": []
     },
+    {
+      "description": "Splits the current file being recorded into a new file.",
+      "requestType": "SplitRecordFile",
+      "complexity": 2,
+      "rpcVersion": "1",
+      "deprecated": false,
+      "initialVersion": "5.5.0",
+      "category": "record",
+      "requestFields": [],
+      "responseFields": []
+    },
+    {
+      "description": "Adds a new chapter marker to the file currently being recorded.\n\nNote: As of OBS 30.2.0, the only file format supporting this feature is Hybrid MP4.",
+      "requestType": "CreateRecordChapter",
+      "complexity": 2,
+      "rpcVersion": "1",
+      "deprecated": false,
+      "initialVersion": "5.5.0",
+      "category": "record",
+      "requestFields": [
+        {
+          "valueName": "chapterName",
+          "valueType": "String",
+          "valueDescription": "Name of the new chapter",
+          "valueRestrictions": null,
+          "valueOptional": true,
+          "valueOptionalBehavior": "Unknown"
+        }
+      ],
+      "responseFields": []
+    },
     {
       "description": "Gets a list of all scene items in a scene.\n\nScenes only",
       "requestType": "GetSceneItemList",
@@ -6046,6 +6077,23 @@
         }
       ]
     },
+    {
+      "description": "The record output has started writing to a new file. For example, when a file split happens.",
+      "eventType": "RecordFileChanged",
+      "eventSubscription": "Outputs",
+      "complexity": 2,
+      "rpcVersion": "1",
+      "deprecated": false,
+      "initialVersion": "5.5.0",
+      "category": "outputs",
+      "dataFields": [
+        {
+          "valueName": "newOutputPath",
+          "valueType": "String",
+          "valueDescription": "File name that the output has begun writing to"
+        }
+      ]
+    },
     {
       "description": "The state of the replay buffer output has changed.",
       "eventType": "ReplayBufferStateChanged",