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

PR review changes: Modify requests names

Browse Source 
Changes requests names to "TriggerHotkeyByName" and "TriggerHotkeyBySequence"
This commit is contained in:
LorenaGdL
2020-09-30 19:15:23 +00:00
parent 9daae857de
commit 449ad6d13c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/WSRequestHandler.cpp
View File

@ -43,8 +43,8 @@ const QHash<QString, RpcMethodHandler> WSRequestHandler::messageMap {
{ "BroadcastCustomMessage", &WSRequestHandler::BroadcastCustomMessage }, { "BroadcastCustomMessage", &WSRequestHandler::BroadcastCustomMessage },
{ "ProcessHotkeyByName", &WSRequestHandler::ProcessHotkeyByName }, { "TriggerHotkeyByName", &WSRequestHandler::TriggerHotkeyByName },
{ "ProcessHotkeyByCombination", &WSRequestHandler::ProcessHotkeyByCombination }, { "TriggerHotkeyBySequence", &WSRequestHandler::TriggerHotkeyBySequence },
{ "SetCurrentScene", &WSRequestHandler::SetCurrentScene }, { "SetCurrentScene", &WSRequestHandler::SetCurrentScene },
{ "GetCurrentScene", &WSRequestHandler::GetCurrentScene }, { "GetCurrentScene", &WSRequestHandler::GetCurrentScene },

4
src/WSRequestHandler.h
View File

@ -61,8 +61,8 @@ class WSRequestHandler {
RpcResponse BroadcastCustomMessage(const RpcRequest&); RpcResponse BroadcastCustomMessage(const RpcRequest&);
RpcResponse ProcessHotkeyByName(const RpcRequest&); RpcResponse TriggerHotkeyByName(const RpcRequest&);
RpcResponse ProcessHotkeyByCombination(const RpcRequest&); RpcResponse TriggerHotkeyBySequence(const RpcRequest&);
RpcResponse SetCurrentScene(const RpcRequest&); RpcResponse SetCurrentScene(const RpcRequest&);
RpcResponse GetCurrentScene(const RpcRequest&); RpcResponse GetCurrentScene(const RpcRequest&);

4
src/WSRequestHandler_General.cpp
View File

@ -356,7 +356,7 @@ RpcResponse WSRequestHandler::OpenProjector(const RpcRequest& request) {
* @category general * @category general
* @since unreleased * @since unreleased
*/ */
RpcResponse WSRequestHandler::ProcessHotkeyByName(const RpcRequest& request) { RpcResponse WSRequestHandler::TriggerHotkeyByName(const RpcRequest& request) {
const char* name = obs_data_get_string(request.parameters(), "name"); const char* name = obs_data_get_string(request.parameters(), "name");
obs_hotkey_t* hk = Utils::FindHotkeyByName(name); obs_hotkey_t* hk = Utils::FindHotkeyByName(name);
@ -378,7 +378,7 @@ RpcResponse WSRequestHandler::ProcessHotkeyByName(const RpcRequest& request) {
* @category general * @category general
* @since unreleased * @since unreleased
*/ */
RpcResponse WSRequestHandler::ProcessHotkeyByCombination(const RpcRequest& request) { RpcResponse WSRequestHandler::TriggerHotkeyBySequence(const RpcRequest& request) {
if (!request.hasField("key")) { if (!request.hasField("key")) {
return request.failed("Missing request key parameter"); return request.failed("Missing request key parameter");
} }