From 37cf8e9d29d9d3c63d83e7f1c519901add72ea63 Mon Sep 17 00:00:00 2001 From: tt2468 Date: Sun, 10 May 2020 21:13:48 -0700 Subject: [PATCH] Rename `MediaPlayPause` to `PlayPauseMedia` Works better with the other upcoming media control request names --- src/WSRequestHandler.cpp | 3 +-- src/WSRequestHandler.h | 2 +- src/WSRequestHandler_MediaControl.cpp | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/WSRequestHandler.cpp b/src/WSRequestHandler.cpp index 1325a73b..2049e27e 100644 --- a/src/WSRequestHandler.cpp +++ b/src/WSRequestHandler.cpp @@ -145,8 +145,7 @@ const QHash WSRequestHandler::messageMap { { "StartOutput", &WSRequestHandler::StartOutput }, { "StopOutput", &WSRequestHandler::StopOutput }, - { "MediaPlayPause", &WSRequestHandler::MediaPlayPause } - + { "PlayPauseMedia", &WSRequestHandler::PlayPauseMedia } }; const QSet WSRequestHandler::authNotRequired { diff --git a/src/WSRequestHandler.h b/src/WSRequestHandler.h index deef55bb..cf79f214 100644 --- a/src/WSRequestHandler.h +++ b/src/WSRequestHandler.h @@ -163,5 +163,5 @@ class WSRequestHandler { RpcResponse StartOutput(const RpcRequest&); RpcResponse StopOutput(const RpcRequest&); - RpcResponse MediaPlayPause(const RpcRequest&); + RpcResponse PlayPauseMedia(const RpcRequest&); }; diff --git a/src/WSRequestHandler_MediaControl.cpp b/src/WSRequestHandler_MediaControl.cpp index e72fe197..019e5f7e 100644 --- a/src/WSRequestHandler_MediaControl.cpp +++ b/src/WSRequestHandler_MediaControl.cpp @@ -9,11 +9,11 @@ * @param {boolean} `playPause` Whether to pause or play the source. `false` for play, `true` for pause. * * @api requests -* @name MediaPlayPause +* @name PlayPauseMedia * @category media control * @since 4.8.0 */ -RpcResponse WSRequestHandler::MediaPlayPause(const RpcRequest& request) { +RpcResponse WSRequestHandler::PlayPauseMedia(const RpcRequest& request) { if ((!request.hasField("sourceName")) || (!request.hasField("playPause"))) { return request.failed("missing request parameters"); } @@ -31,5 +31,5 @@ RpcResponse WSRequestHandler::MediaPlayPause(const RpcRequest& request) { obs_source_media_play_pause(source, playPause); return request.success(); - } +