From 488a57e2debe30a93a1fce86ce0f1258bac424a1 Mon Sep 17 00:00:00 2001 From: tt2468 Date: Tue, 19 Jan 2021 18:23:54 -0800 Subject: [PATCH] Requests: Fix GetSourceDefaultSettings indentation and docs --- src/Utils.cpp | 44 ++++++++++++++++---------------- src/Utils.h | 14 +++++----- src/WSRequestHandler.cpp | 2 +- src/WSRequestHandler_Sources.cpp | 27 ++++++++++---------- 4 files changed, 44 insertions(+), 43 deletions(-) diff --git a/src/Utils.cpp b/src/Utils.cpp index 2752b8ab..b2d7a288 100644 --- a/src/Utils.cpp +++ b/src/Utils.cpp @@ -917,41 +917,41 @@ struct obs_data_item { // Used for OBSDataGetDefaults size_t data_size; size_t default_len; size_t default_size; - size_t autoselect_size; + size_t autoselect_size; size_t capacity; }; obs_data_t *Utils::OBSDataGetDefaults(obs_data_t *data) { - obs_data_t *returnData = obs_data_create(); - obs_data_item_t *item = NULL; + obs_data_t *returnData = obs_data_create(); + obs_data_item_t *item = NULL; - for (item = obs_data_first(data); item; obs_data_item_next(&item)) { - enum obs_data_type type = obs_data_item_gettype(item); - const char *name = (char *)item + sizeof(struct obs_data_item); + for (item = obs_data_first(data); item; obs_data_item_next(&item)) { + enum obs_data_type type = obs_data_item_gettype(item); + const char *name = (char *)item + sizeof(struct obs_data_item); - if (type == OBS_DATA_STRING) { + if (type == OBS_DATA_STRING) { const char *val = obs_data_item_get_string(item); - obs_data_set_string(returnData, name, val); + obs_data_set_string(returnData, name, val); } else if (type == OBS_DATA_NUMBER) { enum obs_data_number_type type = obs_data_item_numtype(item); - if (type == OBS_DATA_NUM_INT) { - long long val = obs_data_item_get_int(item); - obs_data_set_int(returnData, name, val); - } else { - double val = obs_data_item_get_double(item); - obs_data_set_double(returnData, name, val); - } + if (type == OBS_DATA_NUM_INT) { + long long val = obs_data_item_get_int(item); + obs_data_set_int(returnData, name, val); + } else { + double val = obs_data_item_get_double(item); + obs_data_set_double(returnData, name, val); + } } else if (type == OBS_DATA_BOOLEAN) { bool val = obs_data_item_get_bool(item); - obs_data_set_bool(returnData, name, val); + obs_data_set_bool(returnData, name, val); } else if (type == OBS_DATA_OBJECT) { OBSDataAutoRelease obj = obs_data_item_get_obj(item); - obs_data_set_obj(returnData, name, obj); + obs_data_set_obj(returnData, name, obj); } else if (type == OBS_DATA_ARRAY) { - OBSDataArrayAutoRelease array = obs_data_item_get_array(item); - obs_data_set_array(returnData, name, array); - } - } - return returnData; + OBSDataArrayAutoRelease array = obs_data_item_get_array(item); + obs_data_set_array(returnData, name, array); + } + } + return returnData; } diff --git a/src/Utils.h b/src/Utils.h index d15427b5..ba227f15 100644 --- a/src/Utils.h +++ b/src/Utils.h @@ -88,12 +88,12 @@ namespace Utils { const char* GetCurrentRecordingFilename(); QString nsToTimestamp(uint64_t ns); - struct AddSourceData { - obs_source_t *source; - obs_sceneitem_t *sceneItem; - bool setVisible; - }; - void AddSourceHelper(void *_data, obs_scene_t *scene); + struct AddSourceData { + obs_source_t *source; + obs_sceneitem_t *sceneItem; + bool setVisible; + }; + void AddSourceHelper(void *_data, obs_scene_t *scene); - obs_data_t *OBSDataGetDefaults(obs_data_t *data); + obs_data_t *OBSDataGetDefaults(obs_data_t *data); }; diff --git a/src/WSRequestHandler.cpp b/src/WSRequestHandler.cpp index 0b366761..5c502727 100644 --- a/src/WSRequestHandler.cpp +++ b/src/WSRequestHandler.cpp @@ -118,7 +118,7 @@ const QHash WSRequestHandler::messageMap{ { "SetSourceSettings", &WSRequestHandler::SetSourceSettings }, { "GetAudioMonitorType", &WSRequestHandler::GetAudioMonitorType }, { "SetAudioMonitorType", &WSRequestHandler::SetAudioMonitorType }, - { "GetSourceDefaultSettings", &WSRequestHandler::GetSourceDefaultSettings }, + { "GetSourceDefaultSettings", &WSRequestHandler::GetSourceDefaultSettings }, { "TakeSourceScreenshot", &WSRequestHandler::TakeSourceScreenshot }, { "GetSourceFilters", &WSRequestHandler::GetSourceFilters }, diff --git a/src/WSRequestHandler_Sources.cpp b/src/WSRequestHandler_Sources.cpp index 8df1bf5c..a14bcb81 100644 --- a/src/WSRequestHandler_Sources.cpp +++ b/src/WSRequestHandler_Sources.cpp @@ -1684,6 +1684,8 @@ RpcResponse WSRequestHandler::SetAudioMonitorType(const RpcRequest& request) * * @param {String} `sourceKind` Source name. * +* @return {Object} `defaultSettings` Settings object for source. +* * @api requests * @name GetSourceDefaultSettings * @category sources @@ -1695,22 +1697,21 @@ RpcResponse WSRequestHandler::GetSourceDefaultSettings(const RpcRequest& request return request.failed("missing request parameters"); } - QString sourceKind = obs_data_get_string(request.parameters(), "sourceKind"); + QString sourceKind = obs_data_get_string(request.parameters(), "sourceKind"); + if (sourceKind.isEmpty()) { + return request.failed("invalid request parameters"); + } - if (sourceKind.isEmpty()) { - return request.failed("invalid request parameters"); - } + OBSDataAutoRelease defaultData = obs_get_source_defaults(sourceKind.toUtf8()); + if (!defaultData) { + return request.failed("invalid sourceKind"); + } - OBSDataAutoRelease defaultData = obs_get_source_defaults(sourceKind.toUtf8()); - if (!defaultData) { - return request.failed("invalid sourceKind"); - } + OBSDataAutoRelease defaultSettings = Utils::OBSDataGetDefaults(defaultData); - OBSDataAutoRelease defaultSettings = Utils::OBSDataGetDefaults(defaultData); - - OBSDataAutoRelease response = obs_data_create(); - obs_data_set_obj(response, "defaultSettings", defaultSettings); - return request.success(response); + OBSDataAutoRelease response = obs_data_create(); + obs_data_set_obj(response, "defaultSettings", defaultSettings); + return request.success(response); } /**