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: Use OBS naming for monitorType enum

Browse Source
This commit is contained in:
tt2468 2021-09-02 11:24:48 -07:00
parent d2d2bdd730
commit 0269209d59
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/requesthandler/RequestHandler_Inputs.cpp
View File

@ -1,5 +1,4 @@
#include "RequestHandler.h" #include "RequestHandler.h"
#include "../plugin-macros.generated.h"
RequestResult RequestHandler::GetInputList(const Request& request) RequestResult RequestHandler::GetInputList(const Request& request)
{ {
@ -306,21 +305,8 @@ RequestResult RequestHandler::GetInputAudioMonitorType(const Request& request)
if (!input) if (!input)
return RequestResult::Error(statusCode, comment); return RequestResult::Error(statusCode, comment);
enum obs_monitoring_type monitorType = obs_source_get_monitoring_type(input);
json responseData; json responseData;
switch (monitorType) { responseData["monitorType"] = Utils::Obs::StringHelper::GetInputMonitorTypeString(input);
default:
case OBS_MONITORING_TYPE_NONE:
responseData["monitorType"] = "OBS_WEBSOCKET_MONITOR_TYPE_NONE";
break;
case OBS_MONITORING_TYPE_MONITOR_ONLY:
responseData["monitorType"] = "OBS_WEBSOCKET_MONITOR_TYPE_MONITOR_ONLY";
break;
case OBS_MONITORING_TYPE_MONITOR_AND_OUTPUT:
responseData["monitorType"] = "OBS_WEBSOCKET_MONITOR_TYPE_MONITOR_AND_OUTPUT";
break;
}
return RequestResult::Success(responseData); return RequestResult::Success(responseData);
} }
@ -335,11 +321,11 @@ RequestResult RequestHandler::SetInputAudioMonitorType(const Request& request)
enum obs_monitoring_type monitorType; enum obs_monitoring_type monitorType;
std::string monitorTypeString = request.RequestData["monitorType"]; std::string monitorTypeString = request.RequestData["monitorType"];
if (monitorTypeString == "OBS_WEBSOCKET_MONITOR_TYPE_NONE") if (monitorTypeString == "OBS_MONITORING_TYPE_NONE")
monitorType = OBS_MONITORING_TYPE_NONE; monitorType = OBS_MONITORING_TYPE_NONE;
else if (monitorTypeString == "OBS_WEBSOCKET_MONITOR_TYPE_MONITOR_ONLY") else if (monitorTypeString == "OBS_MONITORING_TYPE_MONITOR_ONLY")
monitorType = OBS_MONITORING_TYPE_MONITOR_ONLY; monitorType = OBS_MONITORING_TYPE_MONITOR_ONLY;
else if (monitorTypeString == "OBS_WEBSOCKET_MONITOR_TYPE_MONITOR_AND_OUTPUT") else if (monitorTypeString == "OBS_MONITORING_TYPE_MONITOR_AND_OUTPUT")
monitorType = OBS_MONITORING_TYPE_MONITOR_AND_OUTPUT; monitorType = OBS_MONITORING_TYPE_MONITOR_AND_OUTPUT;
else else
return RequestResult::Error(RequestStatus::InvalidRequestParameter, std::string("Unknown monitor type: ") + monitorTypeString); return RequestResult::Error(RequestStatus::InvalidRequestParameter, std::string("Unknown monitor type: ") + monitorTypeString);