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: Remove UNUSED_PARAMETER() usages

Browse Source 
I prefer to use undefined parameters instead.
This commit is contained in:
tt2468 2021-11-21 03:08:06 -08:00
parent 2a4e86d8da
commit c95511eb5f
12 changed files with 33 additions and 98 deletions

8
src/WebSocketApi.cpp
View File

@ -114,7 +114,7 @@ void WebSocketApi::vendor_register_cb(void *priv_data, calldata_t *cd)
RETURN_SUCCESS();
}
void WebSocketApi::vendor_request_register_cb(void *priv_data, calldata_t *cd)
void WebSocketApi::vendor_request_register_cb(void *, calldata_t *cd)
{
Vendor *v = get_vendor(cd);
if (!v)
@ -146,11 +146,9 @@ 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);
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 *, calldata_t *cd)
{
Vendor *v = get_vendor(cd);
if (!v)
@ -174,8 +172,6 @@ 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);
RETURN_SUCCESS();
UNUSED_PARAMETER(priv_data);
}
void WebSocketApi::vendor_event_emit_cb(void *priv_data, calldata_t *cd)

4
src/eventhandler/EventHandler_Inputs.cpp
View File

@ -41,14 +41,12 @@ void EventHandler::HandleInputRemoved(obs_source_t *source)
BroadcastEvent(EventSubscription::Inputs, "InputRemoved", eventData);
}
void EventHandler::HandleInputNameChanged(obs_source_t *source, std::string oldInputName, std::string inputName)
void EventHandler::HandleInputNameChanged(obs_source_t *, std::string oldInputName, std::string inputName)
{
json eventData;
eventData["oldInputName"] = oldInputName;
eventData["inputName"] = inputName;
BroadcastEvent(EventSubscription::Inputs, "InputNameChanged", eventData);
UNUSED_PARAMETER(source);
}
void EventHandler::HandleInputActiveStateChanged(void *param, calldata_t *data)

4
src/eventhandler/EventHandler_Scenes.cpp
View File

@ -35,14 +35,12 @@ void EventHandler::HandleSceneRemoved(obs_source_t *source)
BroadcastEvent(EventSubscription::Scenes, "SceneRemoved", eventData);
}
void EventHandler::HandleSceneNameChanged(obs_source_t *source, std::string oldSceneName, std::string sceneName)
void EventHandler::HandleSceneNameChanged(obs_source_t *, std::string oldSceneName, std::string sceneName)
{
json eventData;
eventData["oldSceneName"] = oldSceneName;
eventData["sceneName"] = sceneName;
BroadcastEvent(EventSubscription::Scenes, "SceneNameChanged", eventData);
UNUSED_PARAMETER(source);
}
void EventHandler::HandleCurrentSceneChanged()

4
src/eventhandler/EventHandler_Transitions.cpp
View File

@ -35,12 +35,10 @@ void EventHandler::HandleTransitionRemoved(obs_source_t *source)
BroadcastEvent(EventSubscription::Transitions, "TransitionRemoved", eventData);
}
void EventHandler::HandleTransitionNameChanged(obs_source_t *source, std::string oldTransitionName, std::string transitionName)
void EventHandler::HandleTransitionNameChanged(obs_source_t *, std::string oldTransitionName, std::string transitionName)
{
json eventData;
eventData["oldTransitionName"] = oldTransitionName;
eventData["transitionName"] = transitionName;
BroadcastEvent(EventSubscription::Transitions, "TransitionNameChanged", eventData);
UNUSED_PARAMETER(source);
}

3
src/forms/ConnectInfo.cpp
View File

@ -47,9 +47,8 @@ ConnectInfo::~ConnectInfo()
delete ui;
}
void ConnectInfo::showEvent(QShowEvent *event)
void ConnectInfo::showEvent(QShowEvent *)
{
UNUSED_PARAMETER(event);
RefreshData();
}

8
src/forms/SettingsDialog.cpp
View File

@ -75,7 +75,7 @@ SettingsDialog::~SettingsDialog()
delete sessionTableTimer;
}
void SettingsDialog::showEvent(QShowEvent *event)
void SettingsDialog::showEvent(QShowEvent *)
{
auto conf = GetConfig();
if (!conf) {
@ -107,18 +107,14 @@ void SettingsDialog::showEvent(QShowEvent *event)
FillSessionTable();
sessionTableTimer->start(1000);
UNUSED_PARAMETER(event);
}
void SettingsDialog::hideEvent(QHideEvent *event)
void SettingsDialog::hideEvent(QHideEvent *)
{
if (sessionTableTimer->isActive())
sessionTableTimer->stop();
connectInfo->hide();
UNUSED_PARAMETER(event);
}
void SettingsDialog::ToggleShowHide()

16
src/requesthandler/RequestHandler_Config.cpp
View File

@ -78,14 +78,12 @@ RequestResult RequestHandler::SetPersistentData(const Request& request)
return RequestResult::Success();
}
RequestResult RequestHandler::GetSceneCollectionList(const Request& request)
RequestResult RequestHandler::GetSceneCollectionList(const Request&)
{
json responseData;
responseData["currentSceneCollectionName"] = Utils::Obs::StringHelper::GetCurrentSceneCollection();
responseData["sceneCollections"] = Utils::Obs::ListHelper::GetSceneCollectionList();
return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
}
// Does not return until collection has finished switching
@ -135,14 +133,12 @@ RequestResult RequestHandler::CreateSceneCollection(const Request& request)
return RequestResult::Success();
}
RequestResult RequestHandler::GetProfileList(const Request& request)
RequestResult RequestHandler::GetProfileList(const Request&)
{
json responseData;
responseData["currentProfileName"] = Utils::Obs::StringHelper::GetCurrentProfile();
responseData["profiles"] = Utils::Obs::ListHelper::GetProfileList();
return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
}
RequestResult RequestHandler::SetCurrentProfile(const Request& request)
@ -267,7 +263,7 @@ RequestResult RequestHandler::SetProfileParameter(const Request& request)
return RequestResult::Success();
}
RequestResult RequestHandler::GetVideoSettings(const Request& request)
RequestResult RequestHandler::GetVideoSettings(const Request&)
{
struct obs_video_info ovi;
if (!obs_get_video_info(&ovi))
@ -282,8 +278,6 @@ RequestResult RequestHandler::GetVideoSettings(const Request& request)
responseData["outputHeight"] = ovi.output_height;
return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
}
RequestResult RequestHandler::SetVideoSettings(const Request& request)
@ -332,7 +326,7 @@ RequestResult RequestHandler::SetVideoSettings(const Request& request)
return RequestResult::Error(RequestStatus::MissingRequestParameter, "You must specify at least one video-changing pair.");
}
RequestResult RequestHandler::GetStreamServiceSettings(const Request& request)
RequestResult RequestHandler::GetStreamServiceSettings(const Request&)
{
json responseData;
@ -342,8 +336,6 @@ RequestResult RequestHandler::GetStreamServiceSettings(const Request& request)
responseData["streamServiceSettings"] = Utils::Json::ObsDataToJson(serviceSettings, true);
return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
}
RequestResult RequestHandler::SetStreamServiceSettings(const Request& request)

16
src/requesthandler/RequestHandler_General.cpp
View File

@ -24,7 +24,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
#include "../eventhandler/types/EventSubscription.h"
#include "../obs-websocket.h"
RequestResult RequestHandler::GetVersion(const Request& request)
RequestResult RequestHandler::GetVersion(const Request&)
{
json responseData;
responseData["obsVersion"] = Utils::Obs::StringHelper::GetObsVersion();
@ -40,8 +40,6 @@ RequestResult RequestHandler::GetVersion(const Request& request)
responseData["supportedImageFormats"] = supportedImageFormats;
return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
}
RequestResult RequestHandler::BroadcastCustomEvent(const Request& request)
@ -60,7 +58,7 @@ RequestResult RequestHandler::BroadcastCustomEvent(const Request& request)
return RequestResult::Success();
}
RequestResult RequestHandler::GetStats(const Request& request)
RequestResult RequestHandler::GetStats(const Request&)
{
json responseData = Utils::Obs::DataHelper::GetStats();
@ -68,17 +66,13 @@ RequestResult RequestHandler::GetStats(const Request& request)
responseData["webSocketSessionOutgoingMessages"] = _session->OutgoingMessages();
return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
}
RequestResult RequestHandler::GetHotkeyList(const Request& request)
RequestResult RequestHandler::GetHotkeyList(const Request&)
{
json responseData;
responseData["hotkeys"] = Utils::Obs::ListHelper::GetHotkeyNameList();
return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
}
RequestResult RequestHandler::TriggerHotkeyByName(const Request& request)
@ -141,13 +135,11 @@ RequestResult RequestHandler::TriggerHotkeyByKeySequence(const Request& request)
return RequestResult::Success();
}
RequestResult RequestHandler::GetStudioModeEnabled(const Request& request)
RequestResult RequestHandler::GetStudioModeEnabled(const Request&)
{
json responseData;
responseData["studioModeEnabled"] = obs_frontend_preview_program_mode_active();
return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
}
RequestResult RequestHandler::SetStudioModeEnabled(const Request& request)

32
src/requesthandler/RequestHandler_Record.cpp
View File

@ -19,7 +19,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
#include "RequestHandler.h"
RequestResult RequestHandler::GetRecordStatus(const Request& request)
RequestResult RequestHandler::GetRecordStatus(const Request&)
{
OBSOutputAutoRelease recordOutput = obs_frontend_get_streaming_output();
@ -33,11 +33,9 @@ RequestResult RequestHandler::GetRecordStatus(const Request& request)
responseData["outputBytes"] = (uint64_t)obs_output_get_total_bytes(recordOutput);
return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
}
RequestResult RequestHandler::ToggleRecord(const Request& request)
RequestResult RequestHandler::ToggleRecord(const Request&)
{
json responseData;
if (obs_frontend_recording_active()) {
@ -49,11 +47,9 @@ RequestResult RequestHandler::ToggleRecord(const Request& request)
}
return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
}
RequestResult RequestHandler::StartRecord(const Request& request)
RequestResult RequestHandler::StartRecord(const Request&)
{
if (obs_frontend_recording_active())
return RequestResult::Error(RequestStatus::OutputRunning);
@ -62,11 +58,9 @@ RequestResult RequestHandler::StartRecord(const Request& request)
obs_frontend_recording_start();
return RequestResult::Success();
UNUSED_PARAMETER(request);
}
RequestResult RequestHandler::StopRecord(const Request& request)
RequestResult RequestHandler::StopRecord(const Request&)
{
if (!obs_frontend_recording_active())
return RequestResult::Error(RequestStatus::OutputNotRunning);
@ -75,11 +69,9 @@ RequestResult RequestHandler::StopRecord(const Request& request)
obs_frontend_recording_stop();
return RequestResult::Success();
UNUSED_PARAMETER(request);
}
RequestResult RequestHandler::ToggleRecordPause(const Request& request)
RequestResult RequestHandler::ToggleRecordPause(const Request&)
{
json responseData;
if (obs_frontend_recording_paused()) {
@ -91,11 +83,9 @@ RequestResult RequestHandler::ToggleRecordPause(const Request& request)
}
return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
}
RequestResult RequestHandler::PauseRecord(const Request& request)
RequestResult RequestHandler::PauseRecord(const Request&)
{
if (obs_frontend_recording_paused())
return RequestResult::Error(RequestStatus::OutputPaused);
@ -104,11 +94,9 @@ RequestResult RequestHandler::PauseRecord(const Request& request)
obs_frontend_recording_pause(true);
return RequestResult::Success();
UNUSED_PARAMETER(request);
}
RequestResult RequestHandler::ResumeRecord(const Request& request)
RequestResult RequestHandler::ResumeRecord(const Request&)
{
if (!obs_frontend_recording_paused())
return RequestResult::Error(RequestStatus::OutputNotPaused);
@ -117,16 +105,12 @@ RequestResult RequestHandler::ResumeRecord(const Request& request)
obs_frontend_recording_pause(false);
return RequestResult::Success();
UNUSED_PARAMETER(request);
}
RequestResult RequestHandler::GetRecordDirectory(const Request& request)
RequestResult RequestHandler::GetRecordDirectory(const Request&)
{
json responseData;
responseData["recordDirectory"] = Utils::Obs::StringHelper::GetCurrentRecordOutputPath();
return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
}

12
src/requesthandler/RequestHandler_Scenes.cpp
View File

@ -19,7 +19,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
#include "RequestHandler.h"
RequestResult RequestHandler::GetSceneList(const Request& request)
RequestResult RequestHandler::GetSceneList(const Request&)
{
json responseData;
@ -38,19 +38,15 @@ RequestResult RequestHandler::GetSceneList(const Request& request)
responseData["scenes"] = Utils::Obs::ListHelper::GetSceneList();
return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
}
RequestResult RequestHandler::GetCurrentProgramScene(const Request& request)
RequestResult RequestHandler::GetCurrentProgramScene(const Request&)
{
json responseData;
OBSSourceAutoRelease currentProgramScene = obs_frontend_get_current_scene();
responseData["currentProgramSceneName"] = obs_source_get_name(currentProgramScene);
return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
}
RequestResult RequestHandler::SetCurrentProgramScene(const Request& request)
@ -66,7 +62,7 @@ RequestResult RequestHandler::SetCurrentProgramScene(const Request& request)
return RequestResult::Success();
}
RequestResult RequestHandler::GetCurrentPreviewScene(const Request& request)
RequestResult RequestHandler::GetCurrentPreviewScene(const Request&)
{
if (!obs_frontend_preview_program_mode_active())
return RequestResult::Error(RequestStatus::StudioModeNotActive);
@ -77,8 +73,6 @@ RequestResult RequestHandler::GetCurrentPreviewScene(const Request& request)
responseData["currentPreviewSceneName"] = obs_source_get_name(currentPreviewScene);
return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
}
RequestResult RequestHandler::SetCurrentPreviewScene(const Request& request)

16
src/requesthandler/RequestHandler_Stream.cpp
View File

@ -19,7 +19,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
#include "RequestHandler.h"
RequestResult RequestHandler::GetStreamStatus(const Request& request)
RequestResult RequestHandler::GetStreamStatus(const Request&)
{
OBSOutputAutoRelease streamOutput = obs_frontend_get_streaming_output();
@ -35,11 +35,9 @@ RequestResult RequestHandler::GetStreamStatus(const Request& request)
responseData["outputTotalFrames"] = obs_output_get_total_frames(streamOutput);
return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
}
RequestResult RequestHandler::ToggleStream(const Request& request)
RequestResult RequestHandler::ToggleStream(const Request&)
{
json responseData;
if (obs_frontend_streaming_active()) {
@ -51,11 +49,9 @@ RequestResult RequestHandler::ToggleStream(const Request& request)
}
return RequestResult::Success(responseData);
UNUSED_PARAMETER(request);
}
RequestResult RequestHandler::StartStream(const Request& request)
RequestResult RequestHandler::StartStream(const Request&)
{
if (obs_frontend_streaming_active())
return RequestResult::Error(RequestStatus::OutputRunning);
@ -64,11 +60,9 @@ RequestResult RequestHandler::StartStream(const Request& request)
obs_frontend_streaming_start();
return RequestResult::Success();
UNUSED_PARAMETER(request);
}
RequestResult RequestHandler::StopStream(const Request& request)
RequestResult RequestHandler::StopStream(const Request&)
{
if (!obs_frontend_streaming_active())
return RequestResult::Error(RequestStatus::OutputNotRunning);
@ -77,6 +71,4 @@ RequestResult RequestHandler::StopStream(const Request& request)
obs_frontend_streaming_stop();
return RequestResult::Success();
UNUSED_PARAMETER(request);
}

8
src/utils/Obs.cpp
View File

@ -252,14 +252,12 @@ std::vector<obs_hotkey_t *> Utils::Obs::ListHelper::GetHotkeyList()
{
std::vector<obs_hotkey_t *> ret;
obs_enum_hotkeys([](void* data, obs_hotkey_id id, obs_hotkey_t* hotkey) {
obs_enum_hotkeys([](void* data, obs_hotkey_id, obs_hotkey_t* hotkey) {
auto ret = reinterpret_cast<std::vector<obs_hotkey_t *> *>(data);
ret->push_back(hotkey);
return true;
UNUSED_PARAMETER(id);
}, &ret);
return ret;
@ -301,7 +299,7 @@ std::vector<json> Utils::Obs::ListHelper::GetSceneItemList(obs_scene_t *scene, b
std::pair<std::vector<json>, bool> enumData;
enumData.second = basic;
obs_scene_enum_items(scene, [](obs_scene_t* scene, obs_sceneitem_t* sceneItem, void* param) {
obs_scene_enum_items(scene, [](obs_scene_t*, obs_sceneitem_t* sceneItem, void* param) {
auto enumData = reinterpret_cast<std::pair<std::vector<json>, bool>*>(param);
json item;
@ -325,8 +323,6 @@ std::vector<json> Utils::Obs::ListHelper::GetSceneItemList(obs_scene_t *scene, b
enumData->first.push_back(item);
return true;
UNUSED_PARAMETER(scene);
}, &enumData);
return enumData.first;