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

events: add "source kind" param to events + various fixes

Browse Source
This commit is contained in:
Stéphane L
2019-04-20 23:08:06 +02:00
parent fcaac3d515
commit 4092c9a473
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/WSEvents.cpp
View File

@ -762,6 +762,7 @@ void WSEvents::OnTransitionBegin(void* param, calldata_t* data) {
* *
* @return {String} `sourceName` Source name * @return {String} `sourceName` Source name
* @return {String} `sourceType` Source type. Can be "input", "scene", "transition" or "filter". * @return {String} `sourceType` Source type. Can be "input", "scene", "transition" or "filter".
* @return {String} `sourceKind` Source kind.
* @return {Object} `sourceSettings` Source settings * @return {Object} `sourceSettings` Source settings
* *
* @api events * @api events
@ -808,6 +809,7 @@ void WSEvents::OnSourceCreate(void* param, calldata_t* data) {
OBSDataAutoRelease fields = obs_data_create(); OBSDataAutoRelease fields = obs_data_create();
obs_data_set_string(fields, "sourceName", obs_source_get_name(source)); obs_data_set_string(fields, "sourceName", obs_source_get_name(source));
obs_data_set_string(fields, "sourceType", sourceTypeToString(sourceType)); obs_data_set_string(fields, "sourceType", sourceTypeToString(sourceType));
obs_data_set_string(fields, "sourceKind", obs_source_get_id(source));
obs_data_set_obj(fields, "sourceSettings", sourceSettings); obs_data_set_obj(fields, "sourceSettings", sourceSettings);
self->broadcastUpdate("SourceCreated", fields); self->broadcastUpdate("SourceCreated", fields);
} }
@ -817,6 +819,7 @@ void WSEvents::OnSourceCreate(void* param, calldata_t* data) {
* *
* @return {String} `sourceName` Source name * @return {String} `sourceName` Source name
* @return {String} `sourceType` Source type. Can be "input", "scene", "transition" or "filter". * @return {String} `sourceType` Source type. Can be "input", "scene", "transition" or "filter".
* @return {String} `sourceKind` Source kind.
* *
* @api events * @api events
* @name SourceDestroyed * @name SourceDestroyed
@ -836,6 +839,7 @@ void WSEvents::OnSourceDestroy(void* param, calldata_t* data) {
OBSDataAutoRelease fields = obs_data_create(); OBSDataAutoRelease fields = obs_data_create();
obs_data_set_string(fields, "sourceName", obs_source_get_name(source)); obs_data_set_string(fields, "sourceName", obs_source_get_name(source));
obs_data_set_string(fields, "sourceType", sourceTypeToString(sourceType)); obs_data_set_string(fields, "sourceType", sourceTypeToString(sourceType));
obs_data_set_string(fields, "sourceKind", obs_source_get_id(source));
self->broadcastUpdate("SourceDestroyed", fields); self->broadcastUpdate("SourceDestroyed", fields);
} }
@ -934,7 +938,7 @@ void WSEvents::OnSourceAudioSyncOffsetChanged(void* param, calldata_t* data) {
* *
* @return {String} `sourceName` Source name * @return {String} `sourceName` Source name
* @return {Array<SourceRoutingStatus>} `routingStatus` Routing status of the source for each audio mixer (array of 6 values) * @return {Array<SourceRoutingStatus>} `routingStatus` Routing status of the source for each audio mixer (array of 6 values)
* @return {String} `hexMixersValue` Mixers * @return {String} `hexMixersValue` Raw mixer flags (little-endian, one bit per mixer) as an hexadecimal value
* *
* @api events * @api events
* @name OnSourceAudioMixersChanged * @name OnSourceAudioMixersChanged
@ -955,7 +959,7 @@ void WSEvents::OnSourceAudioMixersChanged(void* param, calldata_t* data) {
} }
OBSDataArrayAutoRelease mixers = obs_data_array_create(); OBSDataArrayAutoRelease mixers = obs_data_array_create();
for (size_t i = 0; i < 6; i++) { for (size_t i = 0; i < MAX_AUDIO_MIXES; i++) {
OBSDataAutoRelease item = obs_data_create(); OBSDataAutoRelease item = obs_data_create();
obs_data_set_int(item, "id", i + 1); obs_data_set_int(item, "id", i + 1);
obs_data_set_bool(item, "enabled", (1 << i) & audioMixers); obs_data_set_bool(item, "enabled", (1 << i) & audioMixers);
@ -977,8 +981,6 @@ void WSEvents::OnSourceAudioMixersChanged(void* param, calldata_t* data) {
* @return {String} `previousName` Previous source name * @return {String} `previousName` Previous source name
* @return {String} `newName` New source name * @return {String} `newName` New source name
* *
* TODO which one is current?
*
* @api events * @api events
* @name SourceRenamed * @name SourceRenamed
* @category sources * @category sources