From 10ed2738f53e4cff6de8f3e810460d6910143dfc Mon Sep 17 00:00:00 2001
From: tt2468 <tt2468@gmail.com>
Date: Wed, 13 May 2020 00:10:57 -0700
Subject: [PATCH] Add `ReleaseTBar` request and update `SetTBarPosition` to
 depend on OBS pr 2927

---
 src/WSRequestHandler.cpp             |  1 +
 src/WSRequestHandler.h               |  1 +
 src/WSRequestHandler_Transitions.cpp | 41 +++++++++++++++++++++++++---
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/WSRequestHandler.cpp b/src/WSRequestHandler.cpp
index 018b2638..660ed2c4 100644
--- a/src/WSRequestHandler.cpp
+++ b/src/WSRequestHandler.cpp
@@ -84,6 +84,7 @@ const QHash<QString, RpcMethodHandler> WSRequestHandler::messageMap {
 	{ "SetCurrentTransition", &WSRequestHandler::SetCurrentTransition },
 	{ "SetTransitionDuration", &WSRequestHandler::SetTransitionDuration },
 	{ "GetTransitionDuration", &WSRequestHandler::GetTransitionDuration },
+	{ "ReleaseTBar", &WSRequestHandler::ReleaseTBar	},
 	{ "SetTBarPosition", &WSRequestHandler::SetTBarPosition	},
 	{ "GetTransitionPosition", &WSRequestHandler::GetTransitionPosition },
 
diff --git a/src/WSRequestHandler.h b/src/WSRequestHandler.h
index 5dc30894..a6c7804c 100644
--- a/src/WSRequestHandler.h
+++ b/src/WSRequestHandler.h
@@ -101,6 +101,7 @@ class WSRequestHandler {
 		RpcResponse SetCurrentTransition(const RpcRequest&);
 		RpcResponse SetTransitionDuration(const RpcRequest&);
 		RpcResponse GetTransitionDuration(const RpcRequest&);
+		RpcResponse ReleaseTBar(const RpcRequest&);
 		RpcResponse SetTBarPosition(const RpcRequest&);
 		RpcResponse GetTransitionPosition(const RpcRequest&);
 
diff --git a/src/WSRequestHandler_Transitions.cpp b/src/WSRequestHandler_Transitions.cpp
index a2ba2125..443b3fcd 100644
--- a/src/WSRequestHandler_Transitions.cpp
+++ b/src/WSRequestHandler_Transitions.cpp
@@ -121,6 +121,28 @@ RpcResponse WSRequestHandler::GetTransitionDuration(const RpcRequest& request) {
 	return request.success(response);
 }
 
+/**
+ * Release the T-Bar. YOU MUST CALL THIS IF YOU SPECIFY `release = false` IN `SetTBarPosition`.
+ *
+ * @api requests
+ * @name ReleaseTBar
+ * @category transitions
+ * @since 4.8.0
+ */
+RpcResponse WSRequestHandler::ReleaseTBar(const RpcRequest& request) {
+	if (!obs_frontend_preview_program_mode_active()) {
+		return request.failed("studio mode not enabled");
+	}
+
+	if (obs_transition_fixed(obs_frontend_get_current_transition())) {
+		return request.failed("current transition doesn't support t-bar control");
+	}
+
+	obs_frontend_release_tbar();
+
+	return request.success();
+}
+
 /**
  * Set the manual position of the T-Bar (in Studio Mode) to the specified value. Will return an error if OBS is not in studio mode
  * or if the current transition doesn't support T-Bar control.
@@ -137,17 +159,28 @@ RpcResponse WSRequestHandler::SetTBarPosition(const RpcRequest& request) {
 		return request.failed("studio mode not enabled");
 	}
 
-	OBSSourceAutoRelease currentTransition = obs_frontend_get_current_transition();
-	if (obs_transition_fixed(currentTransition)) {
+	if (obs_transition_fixed(obs_frontend_get_current_transition())) {
 		return request.failed("current transition doesn't support t-bar control");
 	}
 
+	if (!request.hasField("position")) {
+		return request.failed("missing request parameters");
+	}
+
 	double position = obs_data_get_double(request.parameters(), "position");
 	if (position < 0.0 || position > 1.0) {
 		return request.failed("position is out of range");
 	}
-
-	obs_transition_set_manual_time(currentTransition, position);
+	
+	bool release = true;
+	if (request.hasField("release")) {
+		release = obs_data_get_bool(request.parameters(), "release");
+	}
+	
+	obs_frontend_set_tbar_position((int)((float)position * 1024.0));
+	if (release) {
+		obs_frontend_release_tbar();
+	}
 
 	return request.success();
 }