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

Base: Enforce -Wall and fix compiler warnings

Browse Source 
That was *a lot* of warnings.
This commit is contained in:
tt2468 2021-11-20 02:34:48 -08:00
parent c720df5938
commit 4ca259b790
20 changed files with 110 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -275,6 +275,8 @@ endif()
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
include(GNUInstallDirs) include(GNUInstallDirs)
target_compile_options(obs-websocket PRIVATE -Wall -Wextra -Wpedantic -Werror -Wno-missing-field-initializers)
set_target_properties(obs-websocket PROPERTIES PREFIX "") set_target_properties(obs-websocket PROPERTIES PREFIX "")
target_link_libraries(obs-websocket obs-frontend-api) target_link_libraries(obs-websocket obs-frontend-api)

2
src/Config.cpp
View File

@ -37,9 +37,9 @@ with this program. If not, see <https://www.gnu.org/licenses/>
#define CMDLINE_WEBSOCKET_DEBUG "websocket_debug" #define CMDLINE_WEBSOCKET_DEBUG "websocket_debug"
Config::Config() : Config::Config() :
FirstLoad(true),
PortOverridden(false), PortOverridden(false),
PasswordOverridden(false), PasswordOverridden(false),
FirstLoad(true),
ServerEnabled(true), ServerEnabled(true),
ServerPort(4444), ServerPort(4444),
DebugEnabled(false), DebugEnabled(false),

8
src/WebSocketApi.cpp
View File

@ -116,8 +116,6 @@ void WebSocketApi::vendor_register_cb(void *priv_data, calldata_t *cd)
void WebSocketApi::vendor_request_register_cb(void *priv_data, calldata_t *cd) void WebSocketApi::vendor_request_register_cb(void *priv_data, calldata_t *cd)
{ {
auto c = static_cast<WebSocketApi*>(priv_data);
Vendor *v = get_vendor(cd); Vendor *v = get_vendor(cd);
if (!v) if (!v)
RETURN_FAILURE(); RETURN_FAILURE();
@ -148,12 +146,12 @@ void WebSocketApi::vendor_request_register_cb(void *priv_data, calldata_t *cd)
blog_debug("[WebSocketApi::vendor_request_register_cb] [vendorName: %s] Registered new vendor request: %s", v->_name.c_str(), requestType); blog_debug("[WebSocketApi::vendor_request_register_cb] [vendorName: %s] Registered new vendor request: %s", v->_name.c_str(), requestType);
RETURN_SUCCESS(); RETURN_SUCCESS();
UNUSED_PARAMETER(priv_data);
} }
void WebSocketApi::vendor_request_unregister_cb(void *priv_data, calldata_t *cd) void WebSocketApi::vendor_request_unregister_cb(void *priv_data, calldata_t *cd)
{ {
auto c = static_cast<WebSocketApi*>(priv_data);
Vendor *v = get_vendor(cd); Vendor *v = get_vendor(cd);
if (!v) if (!v)
RETURN_FAILURE(); RETURN_FAILURE();
@ -176,6 +174,8 @@ void WebSocketApi::vendor_request_unregister_cb(void *priv_data, calldata_t *cd)
blog_debug("[WebSocketApi::vendor_request_unregister_cb] [vendorName: %s] Unregistered vendor request: %s", v->_name.c_str(), requestType); blog_debug("[WebSocketApi::vendor_request_unregister_cb] [vendorName: %s] Unregistered vendor request: %s", v->_name.c_str(), requestType);
RETURN_SUCCESS(); RETURN_SUCCESS();
UNUSED_PARAMETER(priv_data);
} }
void WebSocketApi::vendor_event_emit_cb(void *priv_data, calldata_t *cd) void WebSocketApi::vendor_event_emit_cb(void *priv_data, calldata_t *cd)

2
src/eventhandler/EventHandler_Inputs.cpp
View File

@ -47,6 +47,8 @@ void EventHandler::HandleInputNameChanged(obs_source_t *source, std::string oldI
eventData["oldInputName"] = oldInputName; eventData["oldInputName"] = oldInputName;
eventData["inputName"] = inputName; eventData["inputName"] = inputName;
BroadcastEvent(EventSubscription::Inputs, "InputNameChanged", eventData); BroadcastEvent(EventSubscription::Inputs, "InputNameChanged", eventData);
UNUSED_PARAMETER(source);
} }
void EventHandler::HandleInputActiveStateChanged(void *param, calldata_t *data) void EventHandler::HandleInputActiveStateChanged(void *param, calldata_t *data)

2
src/eventhandler/EventHandler_Scenes.cpp
View File

@ -41,6 +41,8 @@ void EventHandler::HandleSceneNameChanged(obs_source_t *source, std::string oldS
eventData["oldSceneName"] = oldSceneName; eventData["oldSceneName"] = oldSceneName;
eventData["sceneName"] = sceneName; eventData["sceneName"] = sceneName;
BroadcastEvent(EventSubscription::Scenes, "SceneNameChanged", eventData); BroadcastEvent(EventSubscription::Scenes, "SceneNameChanged", eventData);
UNUSED_PARAMETER(source);
} }
void EventHandler::HandleCurrentSceneChanged() void EventHandler::HandleCurrentSceneChanged()

2
src/eventhandler/EventHandler_Transitions.cpp
View File

@ -41,4 +41,6 @@ void EventHandler::HandleTransitionNameChanged(obs_source_t *source, std::string
eventData["oldTransitionName"] = oldTransitionName; eventData["oldTransitionName"] = oldTransitionName;
eventData["transitionName"] = transitionName; eventData["transitionName"] = transitionName;
BroadcastEvent(EventSubscription::Transitions, "TransitionNameChanged", eventData); BroadcastEvent(EventSubscription::Transitions, "TransitionNameChanged", eventData);
UNUSED_PARAMETER(source);
} }

2
src/eventhandler/types/EventSubscription.h
View File

@ -55,4 +55,4 @@ namespace EventSubscription {
// Receive all event categories (exclude high-volume) // Receive all event categories (exclude high-volume)
All = (General | Config | Scenes | Inputs | Transitions | Filters | Outputs | SceneItems | MediaInputs | ExternalPlugins), All = (General | Config | Scenes | Inputs | Transitions | Filters | Outputs | SceneItems | MediaInputs | ExternalPlugins),
}; };
}; }

6
src/forms/SettingsDialog.cpp
View File

@ -107,16 +107,18 @@ void SettingsDialog::showEvent(QShowEvent *event)
FillSessionTable(); FillSessionTable();
sessionTableTimer->start(1000); sessionTableTimer->start(1000);
UNUSED_PARAMETER(event);
} }
void SettingsDialog::hideEvent(QHideEvent *event) void SettingsDialog::hideEvent(QHideEvent *event)
{ {
UNUSED_PARAMETER(event);
if (sessionTableTimer->isActive()) if (sessionTableTimer->isActive())
sessionTableTimer->stop(); sessionTableTimer->stop();
connectInfo->hide(); connectInfo->hide();
UNUSED_PARAMETER(event);
} }
void SettingsDialog::ToggleShowHide() void SettingsDialog::ToggleShowHide()

16
src/obs-websocket.cpp
View File

@ -42,14 +42,14 @@ SettingsDialog *_settingsDialog = nullptr;
os_cpu_usage_info_t* _cpuUsageInfo; os_cpu_usage_info_t* _cpuUsageInfo;
void ___source_dummy_addref(obs_source_t*) {} void ___source_dummy_addref(obs_source_t*) {}
void ___scene_dummy_addref(obs_scene_t*) {}; void ___scene_dummy_addref(obs_scene_t*) {}
void ___sceneitem_dummy_addref(obs_sceneitem_t*) {}; void ___sceneitem_dummy_addref(obs_sceneitem_t*) {}
void ___data_dummy_addref(obs_data_t*) {}; void ___data_dummy_addref(obs_data_t*) {}
void ___data_array_dummy_addref(obs_data_array_t*) {}; void ___data_array_dummy_addref(obs_data_array_t*) {}
void ___output_dummy_addref(obs_output_t*) {}; void ___output_dummy_addref(obs_output_t*) {}
void ___data_item_dummy_addref(obs_data_item_t*) {}; void ___data_item_dummy_addref(obs_data_item_t*) {}
void ___data_item_release(obs_data_item_t* dataItem){ obs_data_item_release(&dataItem); }; void ___data_item_release(obs_data_item_t* dataItem){ obs_data_item_release(&dataItem); }
void ___properties_dummy_addref(obs_properties_t*) {}; void ___properties_dummy_addref(obs_properties_t*) {}
void WebSocketApiEventCallback(std::string vendorName, std::string eventType, obs_data_t *obsEventData); void WebSocketApiEventCallback(std::string vendorName, std::string eventType, obs_data_t *obsEventData);

8
src/requesthandler/RequestHandler_Config.cpp
View File

@ -84,6 +84,8 @@ RequestResult RequestHandler::GetSceneCollectionList(const Request& request)
responseData["currentSceneCollectionName"] = Utils::Obs::StringHelper::GetCurrentSceneCollection(); responseData["currentSceneCollectionName"] = Utils::Obs::StringHelper::GetCurrentSceneCollection();
responseData["sceneCollections"] = Utils::Obs::ListHelper::GetSceneCollectionList(); responseData["sceneCollections"] = Utils::Obs::ListHelper::GetSceneCollectionList();
return RequestResult::Success(responseData); return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
} }
// Does not return until collection has finished switching // Does not return until collection has finished switching
@ -139,6 +141,8 @@ RequestResult RequestHandler::GetProfileList(const Request& request)
responseData["currentProfileName"] = Utils::Obs::StringHelper::GetCurrentProfile(); responseData["currentProfileName"] = Utils::Obs::StringHelper::GetCurrentProfile();
responseData["profiles"] = Utils::Obs::ListHelper::GetProfileList(); responseData["profiles"] = Utils::Obs::ListHelper::GetProfileList();
return RequestResult::Success(responseData); return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
} }
RequestResult RequestHandler::SetCurrentProfile(const Request& request) RequestResult RequestHandler::SetCurrentProfile(const Request& request)
@ -278,6 +282,8 @@ RequestResult RequestHandler::GetVideoSettings(const Request& request)
responseData["outputHeight"] = ovi.output_height; responseData["outputHeight"] = ovi.output_height;
return RequestResult::Success(responseData); return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
} }
RequestResult RequestHandler::SetVideoSettings(const Request& request) RequestResult RequestHandler::SetVideoSettings(const Request& request)
@ -336,6 +342,8 @@ RequestResult RequestHandler::GetStreamServiceSettings(const Request& request)
responseData["streamServiceSettings"] = Utils::Json::ObsDataToJson(serviceSettings, true); responseData["streamServiceSettings"] = Utils::Json::ObsDataToJson(serviceSettings, true);
return RequestResult::Success(responseData); return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
} }
RequestResult RequestHandler::SetStreamServiceSettings(const Request& request) RequestResult RequestHandler::SetStreamServiceSettings(const Request& request)

8
src/requesthandler/RequestHandler_General.cpp
View File

@ -40,6 +40,8 @@ RequestResult RequestHandler::GetVersion(const Request& request)
responseData["supportedImageFormats"] = supportedImageFormats; responseData["supportedImageFormats"] = supportedImageFormats;
return RequestResult::Success(responseData); return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
} }
RequestResult RequestHandler::BroadcastCustomEvent(const Request& request) RequestResult RequestHandler::BroadcastCustomEvent(const Request& request)
@ -66,6 +68,8 @@ RequestResult RequestHandler::GetStats(const Request& request)
responseData["webSocketSessionOutgoingMessages"] = _session->OutgoingMessages(); responseData["webSocketSessionOutgoingMessages"] = _session->OutgoingMessages();
return RequestResult::Success(responseData); return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
} }
RequestResult RequestHandler::GetHotkeyList(const Request& request) RequestResult RequestHandler::GetHotkeyList(const Request& request)
@ -73,6 +77,8 @@ RequestResult RequestHandler::GetHotkeyList(const Request& request)
json responseData; json responseData;
responseData["hotkeys"] = Utils::Obs::ListHelper::GetHotkeyNameList(); responseData["hotkeys"] = Utils::Obs::ListHelper::GetHotkeyNameList();
return RequestResult::Success(responseData); return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
} }
RequestResult RequestHandler::TriggerHotkeyByName(const Request& request) RequestResult RequestHandler::TriggerHotkeyByName(const Request& request)
@ -140,6 +146,8 @@ RequestResult RequestHandler::GetStudioModeEnabled(const Request& request)
json responseData; json responseData;
responseData["studioModeEnabled"] = obs_frontend_preview_program_mode_active(); responseData["studioModeEnabled"] = obs_frontend_preview_program_mode_active();
return RequestResult::Success(responseData); return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
} }
RequestResult RequestHandler::SetStudioModeEnabled(const Request& request) RequestResult RequestHandler::SetStudioModeEnabled(const Request& request)

16
src/requesthandler/RequestHandler_Record.cpp
View File

@ -33,6 +33,8 @@ RequestResult RequestHandler::GetRecordStatus(const Request& request)
responseData["outputBytes"] = (uint64_t)obs_output_get_total_bytes(recordOutput); responseData["outputBytes"] = (uint64_t)obs_output_get_total_bytes(recordOutput);
return RequestResult::Success(responseData); return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
} }
RequestResult RequestHandler::ToggleRecord(const Request& request) RequestResult RequestHandler::ToggleRecord(const Request& request)
@ -47,6 +49,8 @@ RequestResult RequestHandler::ToggleRecord(const Request& request)
} }
return RequestResult::Success(responseData); return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
} }
RequestResult RequestHandler::StartRecord(const Request& request) RequestResult RequestHandler::StartRecord(const Request& request)
@ -58,6 +62,8 @@ RequestResult RequestHandler::StartRecord(const Request& request)
obs_frontend_recording_start(); obs_frontend_recording_start();
return RequestResult::Success(); return RequestResult::Success();
UNUSED_PARAMETER(request);
} }
RequestResult RequestHandler::StopRecord(const Request& request) RequestResult RequestHandler::StopRecord(const Request& request)
@ -69,6 +75,8 @@ RequestResult RequestHandler::StopRecord(const Request& request)
obs_frontend_recording_stop(); obs_frontend_recording_stop();
return RequestResult::Success(); return RequestResult::Success();
UNUSED_PARAMETER(request);
} }
RequestResult RequestHandler::ToggleRecordPause(const Request& request) RequestResult RequestHandler::ToggleRecordPause(const Request& request)
@ -83,6 +91,8 @@ RequestResult RequestHandler::ToggleRecordPause(const Request& request)
} }
return RequestResult::Success(responseData); return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
} }
RequestResult RequestHandler::PauseRecord(const Request& request) RequestResult RequestHandler::PauseRecord(const Request& request)
@ -94,6 +104,8 @@ RequestResult RequestHandler::PauseRecord(const Request& request)
obs_frontend_recording_pause(true); obs_frontend_recording_pause(true);
return RequestResult::Success(); return RequestResult::Success();
UNUSED_PARAMETER(request);
} }
RequestResult RequestHandler::ResumeRecord(const Request& request) RequestResult RequestHandler::ResumeRecord(const Request& request)
@ -105,6 +117,8 @@ RequestResult RequestHandler::ResumeRecord(const Request& request)
obs_frontend_recording_pause(false); obs_frontend_recording_pause(false);
return RequestResult::Success(); return RequestResult::Success();
UNUSED_PARAMETER(request);
} }
RequestResult RequestHandler::GetRecordDirectory(const Request& request) RequestResult RequestHandler::GetRecordDirectory(const Request& request)
@ -113,4 +127,6 @@ RequestResult RequestHandler::GetRecordDirectory(const Request& request)
responseData["recordDirectory"] = Utils::Obs::StringHelper::GetCurrentRecordOutputPath(); responseData["recordDirectory"] = Utils::Obs::StringHelper::GetCurrentRecordOutputPath();
return RequestResult::Success(responseData); return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
} }

6
src/requesthandler/RequestHandler_SceneItems.cpp
View File

@ -225,7 +225,8 @@ RequestResult RequestHandler::SetSceneItemTransform(const Request& request)
if (!r.ValidateOptionalNumber("scaleX", statusCode, comment)) if (!r.ValidateOptionalNumber("scaleX", statusCode, comment))
return RequestResult::Error(statusCode, comment); return RequestResult::Error(statusCode, comment);
float scaleX = r.RequestData["scaleX"]; float scaleX = r.RequestData["scaleX"];
if (!(-90001.0 < (scaleX * sourceWidth) < 90001.0)) float finalWidth = scaleX * sourceWidth;
if (!(finalWidth > -90001.0 && finalWidth < 90001.0))
return RequestResult::Error(RequestStatus::RequestParameterOutOfRange, "The parameter scaleX is too small or large for the current source resolution."); return RequestResult::Error(RequestStatus::RequestParameterOutOfRange, "The parameter scaleX is too small or large for the current source resolution.");
sceneItemTransform.scale.x = scaleX; sceneItemTransform.scale.x = scaleX;
transformChanged = true; transformChanged = true;
@ -234,7 +235,8 @@ RequestResult RequestHandler::SetSceneItemTransform(const Request& request)
if (!r.ValidateOptionalNumber("scaleY", statusCode, comment, -90001.0, 90001.0)) if (!r.ValidateOptionalNumber("scaleY", statusCode, comment, -90001.0, 90001.0))
return RequestResult::Error(statusCode, comment); return RequestResult::Error(statusCode, comment);
float scaleY = r.RequestData["scaleY"]; float scaleY = r.RequestData["scaleY"];
if (!(-90001.0 < (scaleY * sourceHeight) < 90001.0)) float finalHeight = scaleY * sourceHeight;
if (!(finalHeight > -90001.0 && finalHeight < 90001.0))
return RequestResult::Error(RequestStatus::RequestParameterOutOfRange, "The parameter scaleY is too small or large for the current source resolution."); return RequestResult::Error(RequestStatus::RequestParameterOutOfRange, "The parameter scaleY is too small or large for the current source resolution.");
sceneItemTransform.scale.y = scaleY; sceneItemTransform.scale.y = scaleY;
transformChanged = true; transformChanged = true;

8
src/requesthandler/RequestHandler_Scenes.cpp
View File

@ -38,6 +38,8 @@ RequestResult RequestHandler::GetSceneList(const Request& request)
responseData["scenes"] = Utils::Obs::ListHelper::GetSceneList(); responseData["scenes"] = Utils::Obs::ListHelper::GetSceneList();
return RequestResult::Success(responseData); return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
} }
RequestResult RequestHandler::GetCurrentProgramScene(const Request& request) RequestResult RequestHandler::GetCurrentProgramScene(const Request& request)
@ -45,7 +47,10 @@ RequestResult RequestHandler::GetCurrentProgramScene(const Request& request)
json responseData; json responseData;
OBSSourceAutoRelease currentProgramScene = obs_frontend_get_current_scene(); OBSSourceAutoRelease currentProgramScene = obs_frontend_get_current_scene();
responseData["currentProgramSceneName"] = obs_source_get_name(currentProgramScene); responseData["currentProgramSceneName"] = obs_source_get_name(currentProgramScene);
return RequestResult::Success(responseData); return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
} }
RequestResult RequestHandler::SetCurrentProgramScene(const Request& request) RequestResult RequestHandler::SetCurrentProgramScene(const Request& request)
@ -70,7 +75,10 @@ RequestResult RequestHandler::GetCurrentPreviewScene(const Request& request)
json responseData; json responseData;
responseData["currentPreviewSceneName"] = obs_source_get_name(currentPreviewScene); responseData["currentPreviewSceneName"] = obs_source_get_name(currentPreviewScene);
return RequestResult::Success(responseData); return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
} }
RequestResult RequestHandler::SetCurrentPreviewScene(const Request& request) RequestResult RequestHandler::SetCurrentPreviewScene(const Request& request)

8
src/requesthandler/RequestHandler_Stream.cpp
View File

@ -35,6 +35,8 @@ RequestResult RequestHandler::GetStreamStatus(const Request& request)
responseData["outputTotalFrames"] = obs_output_get_total_frames(streamOutput); responseData["outputTotalFrames"] = obs_output_get_total_frames(streamOutput);
return RequestResult::Success(responseData); return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
} }
RequestResult RequestHandler::ToggleStream(const Request& request) RequestResult RequestHandler::ToggleStream(const Request& request)
@ -49,6 +51,8 @@ RequestResult RequestHandler::ToggleStream(const Request& request)
} }
return RequestResult::Success(responseData); return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
} }
RequestResult RequestHandler::StartStream(const Request& request) RequestResult RequestHandler::StartStream(const Request& request)
@ -60,6 +64,8 @@ RequestResult RequestHandler::StartStream(const Request& request)
obs_frontend_streaming_start(); obs_frontend_streaming_start();
return RequestResult::Success(); return RequestResult::Success();
UNUSED_PARAMETER(request);
} }
RequestResult RequestHandler::StopStream(const Request& request) RequestResult RequestHandler::StopStream(const Request& request)
@ -71,4 +77,6 @@ RequestResult RequestHandler::StopStream(const Request& request)
obs_frontend_streaming_stop(); obs_frontend_streaming_stop();
return RequestResult::Success(); return RequestResult::Success();
UNUSED_PARAMETER(request);
} }

24
src/requesthandler/rpc/Request.cpp
View File

@ -46,12 +46,12 @@ Request::Request(const std::string &requestType, const json &requestData, const
{ {
} }
const bool Request::Contains(const std::string &keyName) const bool Request::Contains(const std::string &keyName) const
{ {
return (RequestData.contains(keyName) && !RequestData[keyName].is_null()); return (RequestData.contains(keyName) && !RequestData[keyName].is_null());
} }
const bool Request::ValidateBasic(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment) const bool Request::ValidateBasic(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment) const
{ {
if (!HasRequestData) { if (!HasRequestData) {
statusCode = RequestStatus::MissingRequestData; statusCode = RequestStatus::MissingRequestData;
@ -68,7 +68,7 @@ const bool Request::ValidateBasic(const std::string &keyName, RequestStatus::Req
return true; return true;
} }
const bool Request::ValidateOptionalNumber(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const double minValue, const double maxValue) const bool Request::ValidateOptionalNumber(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const double minValue, const double maxValue) const
{ {
if (!RequestData[keyName].is_number()) { if (!RequestData[keyName].is_number()) {
statusCode = RequestStatus::InvalidRequestParameterType; statusCode = RequestStatus::InvalidRequestParameterType;
@ -91,7 +91,7 @@ const bool Request::ValidateOptionalNumber(const std::string &keyName, RequestSt
return true; return true;
} }
const bool Request::ValidateNumber(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const double minValue, const double maxValue) const bool Request::ValidateNumber(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const double minValue, const double maxValue) const
{ {
if (!ValidateBasic(keyName, statusCode, comment)) if (!ValidateBasic(keyName, statusCode, comment))
return false; return false;
@ -102,7 +102,7 @@ const bool Request::ValidateNumber(const std::string &keyName, RequestStatus::Re
return true; return true;
} }
const bool Request::ValidateOptionalString(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty) const bool Request::ValidateOptionalString(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty) const
{ {
if (!RequestData[keyName].is_string()) { if (!RequestData[keyName].is_string()) {
statusCode = RequestStatus::InvalidRequestParameterType; statusCode = RequestStatus::InvalidRequestParameterType;
@ -119,7 +119,7 @@ const bool Request::ValidateOptionalString(const std::string &keyName, RequestSt
return true; return true;
} }
const bool Request::ValidateString(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty) const bool Request::ValidateString(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty) const
{ {
if (!ValidateBasic(keyName, statusCode, comment)) if (!ValidateBasic(keyName, statusCode, comment))
return false; return false;
@ -130,7 +130,7 @@ const bool Request::ValidateString(const std::string &keyName, RequestStatus::Re
return true; return true;
} }
const bool Request::ValidateOptionalBoolean(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment) const bool Request::ValidateOptionalBoolean(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment) const
{ {
if (!RequestData[keyName].is_boolean()) { if (!RequestData[keyName].is_boolean()) {
statusCode = RequestStatus::InvalidRequestParameterType; statusCode = RequestStatus::InvalidRequestParameterType;
@ -141,7 +141,7 @@ const bool Request::ValidateOptionalBoolean(const std::string &keyName, RequestS
return true; return true;
} }
const bool Request::ValidateBoolean(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment) const bool Request::ValidateBoolean(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment) const
{ {
if (!ValidateBasic(keyName, statusCode, comment)) if (!ValidateBasic(keyName, statusCode, comment))
return false; return false;
@ -152,7 +152,7 @@ const bool Request::ValidateBoolean(const std::string &keyName, RequestStatus::R
return true; return true;
} }
const bool Request::ValidateOptionalObject(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty) const bool Request::ValidateOptionalObject(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty) const
{ {
if (!RequestData[keyName].is_object()) { if (!RequestData[keyName].is_object()) {
statusCode = RequestStatus::InvalidRequestParameterType; statusCode = RequestStatus::InvalidRequestParameterType;
@ -169,7 +169,7 @@ const bool Request::ValidateOptionalObject(const std::string &keyName, RequestSt
return true; return true;
} }
const bool Request::ValidateObject(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty) const bool Request::ValidateObject(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty) const
{ {
if (!ValidateBasic(keyName, statusCode, comment)) if (!ValidateBasic(keyName, statusCode, comment))
return false; return false;
@ -180,7 +180,7 @@ const bool Request::ValidateObject(const std::string &keyName, RequestStatus::Re
return true; return true;
} }
const bool Request::ValidateOptionalArray(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty) const bool Request::ValidateOptionalArray(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty) const
{ {
if (!RequestData[keyName].is_array()) { if (!RequestData[keyName].is_array()) {
statusCode = RequestStatus::InvalidRequestParameterType; statusCode = RequestStatus::InvalidRequestParameterType;
@ -197,7 +197,7 @@ const bool Request::ValidateOptionalArray(const std::string &keyName, RequestSta
return true; return true;
} }
const bool Request::ValidateArray(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty) const bool Request::ValidateArray(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty) const
{ {
if (!ValidateBasic(keyName, statusCode, comment)) if (!ValidateBasic(keyName, statusCode, comment))
return false; return false;

28
src/requesthandler/rpc/Request.h
View File

@ -41,19 +41,19 @@ struct Request
Request(const std::string &requestType, const json &requestData, const ObsWebSocketRequestBatchExecutionType requestBatchExecutionType); Request(const std::string &requestType, const json &requestData, const ObsWebSocketRequestBatchExecutionType requestBatchExecutionType);
// Contains the key and is not null // Contains the key and is not null
const bool Contains(const std::string &keyName) const; bool Contains(const std::string &keyName) const;
const bool ValidateBasic(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment) const; bool ValidateBasic(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment) const;
const bool ValidateOptionalNumber(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const double minValue = -INFINITY, const double maxValue = INFINITY) const; bool ValidateOptionalNumber(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const double minValue = -INFINITY, const double maxValue = INFINITY) const;
const bool ValidateNumber(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const double minValue = -INFINITY, const double maxValue = INFINITY) const; bool ValidateNumber(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const double minValue = -INFINITY, const double maxValue = INFINITY) const;
const bool ValidateOptionalString(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty = false) const; bool ValidateOptionalString(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty = false) const;
const bool ValidateString(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty = false) const; bool ValidateString(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty = false) const;
const bool ValidateOptionalBoolean(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment) const; bool ValidateOptionalBoolean(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment) const;
const bool ValidateBoolean(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment) const; bool ValidateBoolean(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment) const;
const bool ValidateOptionalObject(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty = false) const; bool ValidateOptionalObject(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty = false) const;
const bool ValidateObject(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty = false) const; bool ValidateObject(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty = false) const;
const bool ValidateOptionalArray(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty = false) const; bool ValidateOptionalArray(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty = false) const;
const bool ValidateArray(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty = false) const; bool ValidateArray(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const bool allowEmpty = false) const;
// All return values have incremented refcounts // All return values have incremented refcounts
obs_source_t *ValidateSource(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment) const; obs_source_t *ValidateSource(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment) const;
@ -62,8 +62,8 @@ struct Request
obs_source_t *ValidateInput(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment) const; obs_source_t *ValidateInput(const std::string &keyName, RequestStatus::RequestStatus &statusCode, std::string &comment) const;
obs_sceneitem_t *ValidateSceneItem(const std::string &sceneKeyName, const std::string &sceneItemIdKeyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const ObsWebSocketSceneFilter filter = OBS_WEBSOCKET_SCENE_FILTER_SCENE_ONLY) const; obs_sceneitem_t *ValidateSceneItem(const std::string &sceneKeyName, const std::string &sceneItemIdKeyName, RequestStatus::RequestStatus &statusCode, std::string &comment, const ObsWebSocketSceneFilter filter = OBS_WEBSOCKET_SCENE_FILTER_SCENE_ONLY) const;
const std::string RequestType; std::string RequestType;
bool HasRequestData; bool HasRequestData;
json RequestData; json RequestData;
const ObsWebSocketRequestBatchExecutionType RequestBatchExecutionType; ObsWebSocketRequestBatchExecutionType RequestBatchExecutionType;
}; };

2
src/requesthandler/rpc/RequestStatus.h
View File

@ -90,4 +90,4 @@ namespace RequestStatus {
// The combination of request parameters cannot be used to perform an action // The combination of request parameters cannot be used to perform an action
CannotAct = 703, CannotAct = 703,
}; };
}; }

4
src/utils/Obs.cpp
View File

@ -258,6 +258,8 @@ std::vector<obs_hotkey_t *> Utils::Obs::ListHelper::GetHotkeyList()
ret->push_back(hotkey); ret->push_back(hotkey);
return true; return true;
UNUSED_PARAMETER(id);
}, &ret); }, &ret);
return ret; return ret;
@ -323,6 +325,8 @@ std::vector<json> Utils::Obs::ListHelper::GetSceneItemList(obs_scene_t *scene, b
enumData->first.push_back(item); enumData->first.push_back(item);
return true; return true;
UNUSED_PARAMETER(scene);
}, &enumData); }, &enumData);
return enumData.first; return enumData.first;

2
src/websocketserver/WebSocketServer_Protocol.cpp
View File

@ -40,7 +40,7 @@ namespace WebSocketOpCode {
RequestBatch = 8, RequestBatch = 8,
RequestBatchResponse = 9, RequestBatchResponse = 9,
}; };
}; }
bool IsSupportedRpcVersion(uint8_t requestedVersion) bool IsSupportedRpcVersion(uint8_t requestedVersion)
{ {