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

Fixed mistake in ToggleMute

Browse Source
This commit is contained in:
Mikhail Swift 2017-02-12 17:55:06 -05:00
parent af16c70143
commit 0816d222c6
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
WSRequestHandler.cpp
View File

@ -52,7 +52,7 @@ WSRequestHandler::WSRequestHandler(QWebSocket *client) :
messageMap["ToggleMute"] = WSRequestHandler::ToggleMute; messageMap["ToggleMute"] = WSRequestHandler::ToggleMute;
messageMap["SetMute"] = WSRequestHandler::SetMute; messageMap["SetMute"] = WSRequestHandler::SetMute;
messageMap["GetVolumes"] = WSRequestHandler::ErrNotImplemented; messageMap["GetVolumes"] = WSRequestHandler::ErrNotImplemented;
authNotRequired.insert("GetVersion"); authNotRequired.insert("GetVersion");
authNotRequired.insert("GetAuthRequired"); authNotRequired.insert("GetAuthRequired");
authNotRequired.insert("Authenticate"); authNotRequired.insert("Authenticate");
@ -82,9 +82,9 @@ void WSRequestHandler::processTextMessage(QString textMessage) {
_requestType = obs_data_get_string(_requestData, "request-type"); _requestType = obs_data_get_string(_requestData, "request-type");
_messageId = obs_data_get_string(_requestData, "message-id"); _messageId = obs_data_get_string(_requestData, "message-id");
if (Config::Current()->AuthRequired if (Config::Current()->AuthRequired
&& !_authenticated && !_authenticated
&& authNotRequired.find(_requestType) == authNotRequired.end()) && authNotRequired.find(_requestType) == authNotRequired.end())
{ {
SendErrorResponse("Not Authenticated"); SendErrorResponse("Not Authenticated");
return; return;
@ -98,7 +98,7 @@ void WSRequestHandler::processTextMessage(QString textMessage) {
else { else {
SendErrorResponse("invalid request type"); SendErrorResponse("invalid request type");
} }
obs_data_release(_requestData); obs_data_release(_requestData);
} }
@ -249,7 +249,7 @@ void WSRequestHandler::HandleSetSourceRender(WSRequestHandler *owner) {
} }
obs_source_t* currentScene = obs_frontend_get_current_scene(); obs_source_t* currentScene = obs_frontend_get_current_scene();
obs_sceneitem_t *sceneItem = Utils::GetSceneItemFromName(currentScene, itemName); obs_sceneitem_t *sceneItem = Utils::GetSceneItemFromName(currentScene, itemName);
if (sceneItem != NULL) { if (sceneItem != NULL) {
obs_sceneitem_set_visible(sceneItem, isVisible); obs_sceneitem_set_visible(sceneItem, isVisible);
@ -296,17 +296,17 @@ void WSRequestHandler::HandleStartStopRecording(WSRequestHandler *owner) {
} }
void WSRequestHandler::HandleGetTransitionList(WSRequestHandler *owner) { void WSRequestHandler::HandleGetTransitionList(WSRequestHandler *owner) {
obs_source_t *current_transition = obs_frontend_get_current_transition(); obs_source_t *current_transition = obs_frontend_get_current_transition();
obs_frontend_source_list transitionList = {}; obs_frontend_source_list transitionList = {};
obs_frontend_get_transitions(&transitionList); obs_frontend_get_transitions(&transitionList);
obs_data_array_t* transitions = obs_data_array_create(); obs_data_array_t* transitions = obs_data_array_create();
for (size_t i = 0; i < transitionList.sources.num; i++) { for (size_t i = 0; i < transitionList.sources.num; i++) {
obs_source_t* transition = transitionList.sources.array[i]; obs_source_t* transition = transitionList.sources.array[i];
obs_data_t *obj = obs_data_create(); obs_data_t *obj = obs_data_create();
obs_data_set_string(obj, "name", obs_source_get_name(transition)); obs_data_set_string(obj, "name", obs_source_get_name(transition));
obs_data_array_push_back(transitions, obj); obs_data_array_push_back(transitions, obj);
obs_data_release(obj); obs_data_release(obj);
} }
@ -379,7 +379,7 @@ void WSRequestHandler::HandleGetVolume(WSRequestHandler *owner) {
} }
obs_source_t* item = obs_get_source_by_name(item_name); obs_source_t* item = obs_get_source_by_name(item_name);
obs_data_t* response = obs_data_create(); obs_data_t* response = obs_data_create();
obs_data_set_string(response, "name", item_name); obs_data_set_string(response, "name", item_name);
obs_data_set_double(response, "volume", obs_source_get_volume(item)); obs_data_set_double(response, "volume", obs_source_get_volume(item));
@ -403,7 +403,7 @@ void WSRequestHandler::ToggleMute(WSRequestHandler *owner) {
owner->SendErrorResponse("invalid request parameters"); owner->SendErrorResponse("invalid request parameters");
} }
obs_source_set_muted(item, obs_source_muted(item)); obs_source_set_muted(item, !obs_source_muted(item));
owner->SendOKResponse(); owner->SendOKResponse();
obs_source_release(item); obs_source_release(item);