From 121d9f492056eea33a2e340e53537914fc7c47dd Mon Sep 17 00:00:00 2001 From: tt2468 <tt2468@gmail.com> Date: Wed, 13 May 2020 23:32:14 -0700 Subject: [PATCH] Remove `GetTransitionPosition` Moving it to its own PR since this PR will not make it into 4.8 --- src/WSRequestHandler.cpp | 1 - src/WSRequestHandler.h | 1 - src/WSRequestHandler_Transitions.cpp | 19 ------------------- 3 files changed, 21 deletions(-) diff --git a/src/WSRequestHandler.cpp b/src/WSRequestHandler.cpp index 660ed2c4..514cf455 100644 --- a/src/WSRequestHandler.cpp +++ b/src/WSRequestHandler.cpp @@ -86,7 +86,6 @@ const QHash<QString, RpcMethodHandler> WSRequestHandler::messageMap { { "GetTransitionDuration", &WSRequestHandler::GetTransitionDuration }, { "ReleaseTBar", &WSRequestHandler::ReleaseTBar }, { "SetTBarPosition", &WSRequestHandler::SetTBarPosition }, - { "GetTransitionPosition", &WSRequestHandler::GetTransitionPosition }, { "SetVolume", &WSRequestHandler::SetVolume }, { "GetVolume", &WSRequestHandler::GetVolume }, diff --git a/src/WSRequestHandler.h b/src/WSRequestHandler.h index a6c7804c..c01ed313 100644 --- a/src/WSRequestHandler.h +++ b/src/WSRequestHandler.h @@ -103,7 +103,6 @@ class WSRequestHandler { RpcResponse GetTransitionDuration(const RpcRequest&); RpcResponse ReleaseTBar(const RpcRequest&); RpcResponse SetTBarPosition(const RpcRequest&); - RpcResponse GetTransitionPosition(const RpcRequest&); RpcResponse SetVolume(const RpcRequest&); RpcResponse GetVolume(const RpcRequest&); diff --git a/src/WSRequestHandler_Transitions.cpp b/src/WSRequestHandler_Transitions.cpp index 5aaadfb7..56505738 100644 --- a/src/WSRequestHandler_Transitions.cpp +++ b/src/WSRequestHandler_Transitions.cpp @@ -184,22 +184,3 @@ RpcResponse WSRequestHandler::SetTBarPosition(const RpcRequest& request) { return request.success(); } - -/** - * Get the position of the current transition. - * - * @return {double} `position` current transition position. This value will be between 0.0 and 1.0. Note: Transition returns 1.0 when not active. - * - * @api requests - * @name GetTransitionPosition - * @category transitions - * @since 4.8.0 - */ -RpcResponse WSRequestHandler::GetTransitionPosition(const RpcRequest& request) { - OBSSourceAutoRelease currentTransition = obs_frontend_get_current_transition(); - - OBSDataAutoRelease response = obs_data_create(); - obs_data_set_double(response, "position", obs_transition_get_time(currentTransition)); - - return request.success(response); -}