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(Get/SetVolume): code nitpicks

Browse Source
This commit is contained in:
Stéphane Lepin 2020-05-14 22:24:58 +02:00
parent 728ea16701
commit ba4e5959b1
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/WSRequestHandler_Sources.cpp
View File

@ -176,11 +176,6 @@ RpcResponse WSRequestHandler::GetVolume(const RpcRequest& request)
return request.failed("missing request parameters"); return request.failed("missing request parameters");
} }
bool useDecibel = false;
if (request.hasField("useDecibel")) {
useDecibel = obs_data_get_bool(request.parameters(), "useDecibel");
}
QString sourceName = obs_data_get_string(request.parameters(), "source"); QString sourceName = obs_data_get_string(request.parameters(), "source");
if (sourceName.isEmpty()) { if (sourceName.isEmpty()) {
return request.failed("invalid request parameters"); return request.failed("invalid request parameters");
@ -191,16 +186,17 @@ RpcResponse WSRequestHandler::GetVolume(const RpcRequest& request)
return request.failed("specified source doesn't exist"); return request.failed("specified source doesn't exist");
} }
float volume = obs_source_get_volume(source);
bool useDecibel = obs_data_get_bool(request.parameters(), "useDecibel");
if (useDecibel) {
volume = obs_mul_to_db(volume);
}
OBSDataAutoRelease response = obs_data_create(); OBSDataAutoRelease response = obs_data_create();
obs_data_set_string(response, "name", obs_source_get_name(source)); obs_data_set_string(response, "name", obs_source_get_name(source));
if (!useDecibel) { obs_data_set_double(response, "volume", volume);
obs_data_set_double(response, "volume", obs_source_get_volume(source));
} else {
float volume = obs_source_get_volume(source);
obs_data_set_double(response, "volume", obs_mul_to_db(volume));
}
obs_data_set_bool(response, "muted", obs_source_muted(source)); obs_data_set_bool(response, "muted", obs_source_muted(source));
return request.success(response); return request.success(response);
} }
@ -222,10 +218,7 @@ RpcResponse WSRequestHandler::SetVolume(const RpcRequest& request)
return request.failed("missing request parameters"); return request.failed("missing request parameters");
} }
bool useDecibel = false; bool useDecibel = obs_data_get_bool(request.parameters(), "useDecibel");
if (request.hasField("useDecibel")) {
useDecibel = obs_data_get_bool(request.parameters(), "useDecibel");
}
QString sourceName = obs_data_get_string(request.parameters(), "source"); QString sourceName = obs_data_get_string(request.parameters(), "source");
float sourceVolume = obs_data_get_double(request.parameters(), "volume"); float sourceVolume = obs_data_get_double(request.parameters(), "volume");
@ -240,12 +233,11 @@ RpcResponse WSRequestHandler::SetVolume(const RpcRequest& request)
return request.failed("specified source doesn't exist"); return request.failed("specified source doesn't exist");
} }
if (!useDecibel) { if (useDecibel) {
obs_source_set_volume(source, sourceVolume); sourceVolume = obs_db_to_mul(sourceVolume);
} else {
float mul = obs_db_to_mul(sourceVolume);
obs_source_set_volume(source, mul);
} }
obs_source_set_volume(source, sourceVolume);
return request.success(); return request.success();
} }