Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

EventHandler: [BREAKING] Rename ExternalPluginEvents to Vendors

Browse Source 
Make it fit the rest of the naming
This commit is contained in:
tt2468 2021-12-14 21:51:30 -08:00
parent 2e7262fe11
commit 82d5468b73
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/eventhandler/types/EventSubscription.h
View File

@ -133,29 +133,29 @@ namespace EventSubscription {
// Receive events in the `MediaInputs` category // Receive events in the `MediaInputs` category
MediaInputs = (1 << 8), MediaInputs = (1 << 8),
/** /**
* Subscription value to receive the `ExternalPluginEvent` event. * Subscription value to receive the `VendorEvent` event.
* *
* @enumIdentifier ExternalPlugins * @enumIdentifier Vendors
* @enumValue (1 << 9) * @enumValue (1 << 9)
* @enumType EventSubscription * @enumType EventSubscription
* @rpcVersion -1 * @rpcVersion -1
* @initialVersion 5.0.0 * @initialVersion 5.0.0
* @api enums * @api enums
*/ */
// Receive events from external OBS plugins // Receive events from external OBS plugins and scripts
ExternalPlugins = (1 << 9), Vendors = (1 << 9),
/** /**
* Helper to receive all non-high-volume events. * Helper to receive all non-high-volume events.
* *
* @enumIdentifier All * @enumIdentifier All
* @enumValue (General | Config | Scenes | Inputs | Transitions | Filters | Outputs | SceneItems | MediaInputs | ExternalPlugins) * @enumValue (General | Config | Scenes | Inputs | Transitions | Filters | Outputs | SceneItems | MediaInputs | Vendors)
* @enumType EventSubscription * @enumType EventSubscription
* @rpcVersion -1 * @rpcVersion -1
* @initialVersion 5.0.0 * @initialVersion 5.0.0
* @api enums * @api enums
*/ */
// Receive all event categories (exclude high-volume) // Receive all event categories (exclude high-volume)
All = (General | Config | Scenes | Inputs | Transitions | Filters | Outputs | SceneItems | MediaInputs | ExternalPlugins), All = (General | Config | Scenes | Inputs | Transitions | Filters | Outputs | SceneItems | MediaInputs | Vendors),
/** /**
* Subscription value to receive the `InputVolumeMeters` high-volume event. * Subscription value to receive the `InputVolumeMeters` high-volume event.
* *

4
src/obs-websocket.cpp
View File

@ -150,7 +150,7 @@ void ___properties_dummy_addref(obs_properties_t*) {}
* @dataField eventType | String | Vendor-provided event typedef * @dataField eventType | String | Vendor-provided event typedef
* @dataField eventData | Object | Vendor-provided event data. {} if event does not provide any data * @dataField eventData | Object | Vendor-provided event data. {} if event does not provide any data
* *
* @eventSubscription ExternalPlugins * @eventSubscription Vendors
* @eventType VendorEvent * @eventType VendorEvent
* @complexity 3 * @complexity 3
* @rpcVersion -1 * @rpcVersion -1
@ -167,7 +167,7 @@ void WebSocketApiEventCallback(std::string vendorName, std::string eventType, ob
broadcastEventData["eventType"] = eventType; broadcastEventData["eventType"] = eventType;
broadcastEventData["eventData"] = eventData; broadcastEventData["eventData"] = eventData;
_webSocketServer->BroadcastEvent(EventSubscription::ExternalPlugins, "VendorEvent", broadcastEventData); _webSocketServer->BroadcastEvent(EventSubscription::Vendors, "VendorEvent", broadcastEventData);
} }