Skip to content

Commit c21afa4

Browse files
duncte123duncte123
committed
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
1 parent 5b4aa9d commit c21afa4

23 files changed

+339
-108
lines changed

‎CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16...3.25)
22

33
legacy_check()
44

5-
set(obs-websocket_VERSION 5.4.2)
5+
set(obs-websocket_VERSION 5.5.2)
66
set(OBS_WEBSOCKET_RPC_VERSION 1)
77

88
include(cmake/obs-websocket-api.cmake)
@@ -138,12 +138,14 @@ target_compile_definitions(
138138
target_compile_options(
139139
obs-websocket
140140
PRIVATE $<$<PLATFORM_ID:Windows>:/wd4267>
141+
$<$<PLATFORM_ID:Windows>:/wd4996>
141142
$<$<COMPILE_LANG_AND_ID:CXX,GNU,AppleClang,Clang>:-Wall>
142143
$<$<COMPILE_LANG_AND_ID:CXX,GNU,AppleClang,Clang>:-Wno-error=float-conversion>
143144
$<$<COMPILE_LANG_AND_ID:CXX,GNU,AppleClang,Clang>:-Wno-error=shadow>
144145
$<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wno-error=format-overflow>
145146
$<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wno-error=int-conversion>
146147
$<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wno-error=comment>
148+
$<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wno-error=deprecated-declarations>
147149
$<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wno-error=null-pointer-subtraction>
148150
$<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wno-error=deprecated-declarations>
149151
$<$<COMPILE_LANG_AND_ID:CXX,AppleClang,Clang>:-Wno-error=implicit-int-conversion>

‎cmake/legacy.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
project(obs-websocket VERSION 5.4.2)
1+
project(obs-websocket VERSION 5.5.2)
22
set(OBS_WEBSOCKET_RPC_VERSION 1)
33

44
option(ENABLE_WEBSOCKET "Enable building OBS with websocket plugin" ON)

‎data/locale/be-BY.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ OBSWebSocket.Settings.ServerPort="Порт сервера"
1313
OBSWebSocket.Settings.ShowConnectInfo="Паказаць звесткі пра злучэнне"
1414
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Увага: ідзе трансляцыя"
1515
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Выглядае, што ў бягучы момант ідзе вывад (стрым, запіс і г. д.)."
16-
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Вы ўпэўненыя, што хочаце паказаць вашы звесткі пра злучэнне?"
16+
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Ці вы ўпэўненыя, што хочаце паказаць вашы звесткі пра злучэнне?"
1717
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Увага: магчымая небяспека"
1818
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket захоўвае пароль сервера ў выглядзе звычайнага тэксту. Настойліва рэкамендуецца выкарыстоўваць пароль, які згенеруе obs-websocket."
19-
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Вы ўпэўненыя, што хочаце карыстацца сваім паролем?"
19+
OBSWebSocket.Settings.Save.UserPasswordWarningInfoText="Ці вы ўпэўненыя, што хочаце карыстацца сваім паролем?"
2020
OBSWebSocket.Settings.Save.PasswordInvalidErrorTitle="Увага: памылковая канфігурацыя"
2121
OBSWebSocket.Settings.Save.PasswordInvalidErrorMessage="Пароль павінен утрымліваць 6 або больш сімвалаў."
2222
OBSWebSocket.SessionTable.Title="Злучаныя сеансы WebSocket"

‎data/locale/ro-RO.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ OBSWebSocket.Settings.GeneratePassword="Generează parola"
1212
OBSWebSocket.Settings.ServerPort="Portul serverului"
1313
OBSWebSocket.Settings.ShowConnectInfo="Afișează informațiile conexiunii"
1414
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Avertisment: În prezent în direct"
15-
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Se pare că un output (transmisiune, înregistrare etc.) este activ în prezent."
15+
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Se pare că un output (stream, înregistrare etc.) este activ în prezent."
1616
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Sigur vrei să afișezi informațiile de conectare?"
1717
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Avertisment: Potențială problemă de securitate"
1818
OBSWebSocket.Settings.Save.UserPasswordWarningMessage="obs-websocket stochează parola serverului ca text simplu. Este foarte recomandat să folosiți o parolă generată de obs-websocket."

‎data/locale/ru-RU.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ OBSWebSocket.SessionTable.KickButtonColumnTitle="Выгнать?"
2828
OBSWebSocket.SessionTable.KickButtonText="Выгнать"
2929
OBSWebSocket.ConnectInfo.DialogTitle="Сведения о подключении WebSocket"
3030
OBSWebSocket.ConnectInfo.CopyText="Копировать"
31-
OBSWebSocket.ConnectInfo.ServerIp="IP сервера (лучшая догадка)"
31+
OBSWebSocket.ConnectInfo.ServerIp="IP сервера (вероятный)"
3232
OBSWebSocket.ConnectInfo.ServerPort="Порт сервера"
3333
OBSWebSocket.ConnectInfo.ServerPassword="Пароль сервера"
3434
OBSWebSocket.ConnectInfo.ServerPasswordPlaceholderText="[Вход отключён]"

‎data/locale/sv-SE.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
OBSWebSocket.Plugin.Description="Fjärrkontroll av OBS Studio via WebSocket"
22
OBSWebSocket.Settings.DialogTitle="WebSocket-serverinställningar"
3-
OBSWebSocket.Settings.PluginSettingsTitle="Insticksmodulsinställningar"
3+
OBSWebSocket.Settings.PluginSettingsTitle="Insticksprogramsinställningar"
44
OBSWebSocket.Settings.ServerEnable="Aktivera WebSocket-server"
55
OBSWebSocket.Settings.AlertsEnable="Aktivera systemfältsmeddelanden"
66
OBSWebSocket.Settings.DebugEnable="Aktivera felsökningsloggning"
@@ -11,7 +11,7 @@ OBSWebSocket.Settings.Password="Serverlösenord"
1111
OBSWebSocket.Settings.GeneratePassword="Generera lösenord"
1212
OBSWebSocket.Settings.ServerPort="Serverport"
1313
OBSWebSocket.Settings.ShowConnectInfo="Visa anslutningsinformation"
14-
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Varning: Sänder för närvarande"
14+
OBSWebSocket.Settings.ShowConnectInfoWarningTitle="Varning: Direktsändning pågår"
1515
OBSWebSocket.Settings.ShowConnectInfoWarningMessage="Det verkar som om en utmatning (ström, inspelning, etc.) är för närvarande aktiv."
1616
OBSWebSocket.Settings.ShowConnectInfoWarningInfoText="Är du säker på att du vill visa din anslutningsinformation?"
1717
OBSWebSocket.Settings.Save.UserPasswordWarningTitle="Varning: Potentiellt säkerhetsproblem"

‎data/locale/tt-RU.ini

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
OBSWebSocket.Settings.ServerSettingsTitle="Сервер көйләүләре"
2+
OBSWebSocket.Settings.Password="Сервер серсүзе"
3+
OBSWebSocket.Settings.GeneratePassword="Серсүзне ясау"
4+
OBSWebSocket.Settings.ServerPort="Сервер порты"
5+
OBSWebSocket.SessionTable.KickButtonColumnTitle="Чыгарыргамы?"
6+
OBSWebSocket.SessionTable.KickButtonText="Чыгару"
7+
OBSWebSocket.ConnectInfo.CopyText="Күчермә алу"
8+
OBSWebSocket.ConnectInfo.ServerPort="Сервер порты"
9+
OBSWebSocket.ConnectInfo.ServerPassword="Сервер серсүзе"

‎docs/generated/protocol.json

+80-32
Original file line numberDiff line numberDiff line change
@@ -461,72 +461,72 @@
461461
{
462462
"description": "Unknown state.",
463463
"enumIdentifier": "OBS_WEBSOCKET_OUTPUT_UNKNOWN",
464-
"rpcVersion": 1,
465-
"deprecated": true,
464+
"rpcVersion": "1",
465+
"deprecated": false,
466466
"initialVersion": "5.0.0",
467467
"enumValue": "OBS_WEBSOCKET_OUTPUT_UNKNOWN"
468468
},
469469
{
470470
"description": "The output is starting.",
471471
"enumIdentifier": "OBS_WEBSOCKET_OUTPUT_STARTING",
472-
"rpcVersion": 1,
473-
"deprecated": true,
472+
"rpcVersion": "1",
473+
"deprecated": false,
474474
"initialVersion": "5.0.0",
475475
"enumValue": "OBS_WEBSOCKET_OUTPUT_STARTING"
476476
},
477477
{
478478
"description": "The input has started.",
479479
"enumIdentifier": "OBS_WEBSOCKET_OUTPUT_STARTED",
480-
"rpcVersion": 1,
481-
"deprecated": true,
480+
"rpcVersion": "1",
481+
"deprecated": false,
482482
"initialVersion": "5.0.0",
483483
"enumValue": "OBS_WEBSOCKET_OUTPUT_STARTED"
484484
},
485485
{
486486
"description": "The output is stopping.",
487487
"enumIdentifier": "OBS_WEBSOCKET_OUTPUT_STOPPING",
488-
"rpcVersion": 1,
489-
"deprecated": true,
488+
"rpcVersion": "1",
489+
"deprecated": false,
490490
"initialVersion": "5.0.0",
491491
"enumValue": "OBS_WEBSOCKET_OUTPUT_STOPPING"
492492
},
493493
{
494494
"description": "The output has stopped.",
495495
"enumIdentifier": "OBS_WEBSOCKET_OUTPUT_STOPPED",
496-
"rpcVersion": 1,
497-
"deprecated": true,
496+
"rpcVersion": "1",
497+
"deprecated": false,
498498
"initialVersion": "5.0.0",
499499
"enumValue": "OBS_WEBSOCKET_OUTPUT_STOPPED"
500500
},
501501
{
502502
"description": "The output has disconnected and is reconnecting.",
503503
"enumIdentifier": "OBS_WEBSOCKET_OUTPUT_RECONNECTING",
504-
"rpcVersion": 1,
505-
"deprecated": true,
504+
"rpcVersion": "1",
505+
"deprecated": false,
506506
"initialVersion": "5.0.0",
507507
"enumValue": "OBS_WEBSOCKET_OUTPUT_RECONNECTING"
508508
},
509509
{
510510
"description": "The output has reconnected successfully.",
511511
"enumIdentifier": "OBS_WEBSOCKET_OUTPUT_RECONNECTED",
512-
"rpcVersion": 1,
513-
"deprecated": true,
512+
"rpcVersion": "1",
513+
"deprecated": false,
514514
"initialVersion": "5.1.0",
515515
"enumValue": "OBS_WEBSOCKET_OUTPUT_RECONNECTED"
516516
},
517517
{
518518
"description": "The output is now paused.",
519519
"enumIdentifier": "OBS_WEBSOCKET_OUTPUT_PAUSED",
520-
"rpcVersion": 1,
521-
"deprecated": true,
520+
"rpcVersion": "1",
521+
"deprecated": false,
522522
"initialVersion": "5.1.0",
523523
"enumValue": "OBS_WEBSOCKET_OUTPUT_PAUSED"
524524
},
525525
{
526526
"description": "The output has been resumed (unpaused).",
527527
"enumIdentifier": "OBS_WEBSOCKET_OUTPUT_RESUMED",
528-
"rpcVersion": 1,
529-
"deprecated": true,
528+
"rpcVersion": "1",
529+
"deprecated": false,
530530
"initialVersion": "5.0.0",
531531
"enumValue": "OBS_WEBSOCKET_OUTPUT_RESUMED"
532532
}
@@ -538,56 +538,56 @@
538538
{
539539
"description": "No action.",
540540
"enumIdentifier": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_NONE",
541-
"rpcVersion": 1,
542-
"deprecated": true,
541+
"rpcVersion": "1",
542+
"deprecated": false,
543543
"initialVersion": "5.0.0",
544544
"enumValue": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_NONE"
545545
},
546546
{
547547
"description": "Play the media input.",
548548
"enumIdentifier": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PLAY",
549-
"rpcVersion": 1,
550-
"deprecated": true,
549+
"rpcVersion": "1",
550+
"deprecated": false,
551551
"initialVersion": "5.0.0",
552552
"enumValue": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PLAY"
553553
},
554554
{
555555
"description": "Pause the media input.",
556556
"enumIdentifier": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PAUSE",
557-
"rpcVersion": 1,
558-
"deprecated": true,
557+
"rpcVersion": "1",
558+
"deprecated": false,
559559
"initialVersion": "5.0.0",
560560
"enumValue": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PAUSE"
561561
},
562562
{
563563
"description": "Stop the media input.",
564564
"enumIdentifier": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_STOP",
565-
"rpcVersion": 1,
566-
"deprecated": true,
565+
"rpcVersion": "1",
566+
"deprecated": false,
567567
"initialVersion": "5.0.0",
568568
"enumValue": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_STOP"
569569
},
570570
{
571571
"description": "Restart the media input.",
572572
"enumIdentifier": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_RESTART",
573-
"rpcVersion": 1,
574-
"deprecated": true,
573+
"rpcVersion": "1",
574+
"deprecated": false,
575575
"initialVersion": "5.0.0",
576576
"enumValue": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_RESTART"
577577
},
578578
{
579579
"description": "Go to the next playlist item.",
580580
"enumIdentifier": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_NEXT",
581-
"rpcVersion": 1,
582-
"deprecated": true,
581+
"rpcVersion": "1",
582+
"deprecated": false,
583583
"initialVersion": "5.0.0",
584584
"enumValue": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_NEXT"
585585
},
586586
{
587587
"description": "Go to the previous playlist item.",
588588
"enumIdentifier": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PREVIOUS",
589-
"rpcVersion": 1,
590-
"deprecated": true,
589+
"rpcVersion": "1",
590+
"deprecated": false,
591591
"initialVersion": "5.0.0",
592592
"enumValue": "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PREVIOUS"
593593
}
@@ -3472,6 +3472,37 @@
34723472
"requestFields": [],
34733473
"responseFields": []
34743474
},
3475+
{
3476+
"description": "Splits the current file being recorded into a new file.",
3477+
"requestType": "SplitRecordFile",
3478+
"complexity": 2,
3479+
"rpcVersion": "1",
3480+
"deprecated": false,
3481+
"initialVersion": "5.5.0",
3482+
"category": "record",
3483+
"requestFields": [],
3484+
"responseFields": []
3485+
},
3486+
{
3487+
"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.",
3488+
"requestType": "CreateRecordChapter",
3489+
"complexity": 2,
3490+
"rpcVersion": "1",
3491+
"deprecated": false,
3492+
"initialVersion": "5.5.0",
3493+
"category": "record",
3494+
"requestFields": [
3495+
{
3496+
"valueName": "chapterName",
3497+
"valueType": "String",
3498+
"valueDescription": "Name of the new chapter",
3499+
"valueRestrictions": null,
3500+
"valueOptional": true,
3501+
"valueOptionalBehavior": "Unknown"
3502+
}
3503+
],
3504+
"responseFields": []
3505+
},
34753506
{
34763507
"description": "Gets a list of all scene items in a scene.\n\nScenes only",
34773508
"requestType": "GetSceneItemList",
@@ -6046,6 +6077,23 @@
60466077
}
60476078
]
60486079
},
6080+
{
6081+
"description": "The record output has started writing to a new file. For example, when a file split happens.",
6082+
"eventType": "RecordFileChanged",
6083+
"eventSubscription": "Outputs",
6084+
"complexity": 2,
6085+
"rpcVersion": "1",
6086+
"deprecated": false,
6087+
"initialVersion": "5.5.0",
6088+
"category": "outputs",
6089+
"dataFields": [
6090+
{
6091+
"valueName": "newOutputPath",
6092+
"valueType": "String",
6093+
"valueDescription": "File name that the output has begun writing to"
6094+
}
6095+
]
6096+
},
60496097
{
60506098
"description": "The state of the replay buffer output has changed.",
60516099
"eventType": "ReplayBufferStateChanged",

0 commit comments

Comments
 (0)