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

Requests: Apply some code style changes

Browse Source
This commit is contained in:
tt2468 2021-11-17 02:09:27 -08:00
parent 061fb6f012
commit 1dbb7a9686
5 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/requesthandler/RequestHandler_Config.cpp
View File

@ -208,10 +208,10 @@ RequestResult RequestHandler::GetProfileParameter(const Request& request)
responseData["defaultParameterValue"] = config_get_default_string(profile, parameterCategory.c_str(), parameterName.c_str()); responseData["defaultParameterValue"] = config_get_default_string(profile, parameterCategory.c_str(), parameterName.c_str());
} else if (config_has_user_value(profile, parameterCategory.c_str(), parameterName.c_str())) { } else if (config_has_user_value(profile, parameterCategory.c_str(), parameterName.c_str())) {
responseData["parameterValue"] = config_get_string(profile, parameterCategory.c_str(), parameterName.c_str()); responseData["parameterValue"] = config_get_string(profile, parameterCategory.c_str(), parameterName.c_str());
responseData["defaultParameterValue"] = nullptr; responseData["defaultParameterValue"] = json::null();
} else { } else {
responseData["parameterValue"] = nullptr; responseData["parameterValue"] = json::null();
responseData["defaultParameterValue"] = nullptr; responseData["defaultParameterValue"] = json::null();
} }
return RequestResult::Success(responseData); return RequestResult::Success(responseData);

2
src/requesthandler/RequestHandler_Inputs.cpp
View File

@ -365,6 +365,8 @@ std::vector<json> GetListPropertyItems(obs_property_t *property)
itemData["itemValue"] = obs_property_list_item_float(property, i); itemData["itemValue"] = obs_property_list_item_float(property, i);
} else if (itemFormat == OBS_COMBO_FORMAT_STRING) { } else if (itemFormat == OBS_COMBO_FORMAT_STRING) {
itemData["itemValue"] = obs_property_list_item_string(property, i); itemData["itemValue"] = obs_property_list_item_string(property, i);
} else {
itemData["itemValue"] = json::null();
} }
ret.push_back(itemData); ret.push_back(itemData);
} }

3
src/requesthandler/RequestHandler_MediaInputs.cpp
View File

@ -15,6 +15,9 @@ RequestResult RequestHandler::GetMediaInputStatus(const Request& request)
if (mediaState == OBS_MEDIA_STATE_PLAYING || mediaState == OBS_MEDIA_STATE_PAUSED) { if (mediaState == OBS_MEDIA_STATE_PLAYING || mediaState == OBS_MEDIA_STATE_PAUSED) {
responseData["mediaDuration"] = obs_source_media_get_duration(input); responseData["mediaDuration"] = obs_source_media_get_duration(input);
responseData["mediaCursor"] = obs_source_media_get_time(input); responseData["mediaCursor"] = obs_source_media_get_time(input);
} else {
responseData["mediaDuration"] = json::null();
responseData["mediaCursor"] = json::null();
} }
return RequestResult::Success(responseData); return RequestResult::Success(responseData);

4
src/requesthandler/RequestHandler_Scenes.cpp
View File

@ -8,13 +8,13 @@ RequestResult RequestHandler::GetSceneList(const Request& request)
if (currentProgramScene) if (currentProgramScene)
responseData["currentProgramSceneName"] = obs_source_get_name(currentProgramScene); responseData["currentProgramSceneName"] = obs_source_get_name(currentProgramScene);
else else
responseData["currentProgramSceneName"] = nullptr; responseData["currentProgramSceneName"] = json::null();
OBSSourceAutoRelease currentPreviewScene = obs_frontend_get_current_preview_scene(); OBSSourceAutoRelease currentPreviewScene = obs_frontend_get_current_preview_scene();
if (currentPreviewScene) if (currentPreviewScene)
responseData["currentPreviewSceneName"] = obs_source_get_name(currentPreviewScene); responseData["currentPreviewSceneName"] = obs_source_get_name(currentPreviewScene);
else else
responseData["currentPreviewSceneName"] = nullptr; responseData["currentPreviewSceneName"] = json::null();
responseData["scenes"] = Utils::Obs::ListHelper::GetSceneList(); responseData["scenes"] = Utils::Obs::ListHelper::GetSceneList();

6
src/utils/Obs.cpp
View File

@ -283,8 +283,12 @@ std::vector<json> Utils::Obs::ListHelper::GetSceneItemList(obs_scene_t *scene, b
item["sourceType"] = StringHelper::GetSourceType(itemSource); item["sourceType"] = StringHelper::GetSourceType(itemSource);
if (obs_source_get_type(itemSource) == OBS_SOURCE_TYPE_INPUT) if (obs_source_get_type(itemSource) == OBS_SOURCE_TYPE_INPUT)
item["inputKind"] = obs_source_get_id(itemSource); item["inputKind"] = obs_source_get_id(itemSource);
else if (obs_source_get_type(itemSource) == OBS_SOURCE_TYPE_SCENE) else
item["inputKind"] = json::null();
if (obs_source_get_type(itemSource) == OBS_SOURCE_TYPE_SCENE)
item["isGroup"] = obs_source_is_group(itemSource); item["isGroup"] = obs_source_is_group(itemSource);
else
item["isGroup"] = json::null();
} }
enumData->first.push_back(item); enumData->first.push_back(item);