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(Profiles + SceneCollections): don't use QString where it is not needed

Browse Source
This commit is contained in:
Stéphane Lepin 2020-09-15 18:17:45 +02:00
parent 539e636939
commit 0dd0d01e8f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/WSRequestHandler_Profiles.cpp
View File

@ -17,19 +17,19 @@ RpcResponse WSRequestHandler::SetCurrentProfile(const RpcRequest& request) {
return request.failed("missing request parameters"); return request.failed("missing request parameters");
} }
QString profileName = obs_data_get_string(request.parameters(), "profile-name"); const char* profileName = obs_data_get_string(request.parameters(), "profile-name");
if (profileName.isEmpty()) { if (!profileName) {
return request.failed("invalid request parameters"); return request.failed("invalid request parameters");
} }
char** profiles = obs_frontend_get_profiles(); char** profiles = obs_frontend_get_profiles();
bool profileExists = Utils::StringInStringList(profiles, profileName.toUtf8()); bool profileExists = Utils::StringInStringList(profiles, profileName);
bfree(profiles); bfree(profiles);
if (!profileExists) { if (!profileExists) {
return request.failed("profile does not exist"); return request.failed("profile does not exist");
} }
obs_frontend_set_current_profile(profileName.toUtf8()); obs_frontend_set_current_profile(profileName);
return request.success(); return request.success();
} }

8
src/WSRequestHandler_SceneCollections.cpp
View File

@ -17,19 +17,19 @@ RpcResponse WSRequestHandler::SetCurrentSceneCollection(const RpcRequest& reques
return request.failed("missing request parameters"); return request.failed("missing request parameters");
} }
QString sceneCollection = obs_data_get_string(request.parameters(), "sc-name"); const char* sceneCollection = obs_data_get_string(request.parameters(), "sc-name");
if (sceneCollection.isEmpty()) { if (!sceneCollection) {
return request.failed("invalid request parameters"); return request.failed("invalid request parameters");
} }
char** collections = obs_frontend_get_scene_collections(); char** collections = obs_frontend_get_scene_collections();
bool collectionExists = Utils::StringInStringList(collections, sceneCollection.toUtf8()); bool collectionExists = Utils::StringInStringList(collections, sceneCollection);
bfree(collections); bfree(collections);
if (!collectionExists) { if (!collectionExists) {
return request.failed("scene collection does not exist"); return request.failed("scene collection does not exist");
} }
obs_frontend_set_current_scene_collection(sceneCollection.toUtf8()); obs_frontend_set_current_scene_collection(sceneCollection);
return request.success(); return request.success();
} }