From 790605744081900ae88e6e48757aa7cf84ad5e07 Mon Sep 17 00:00:00 2001
From: tt2468 <tt2468@gmail.com>
Date: Tue, 2 Aug 2022 15:58:09 -0700
Subject: [PATCH] base: Update source code to build against 27.2.4

---
 src/Utils.cpp                      |  3 +--
 src/WSRequestHandler_Recording.cpp | 37 +++++++++++-------------------
 src/obs-websocket.cpp              |  6 -----
 src/obs-websocket.h                | 17 --------------
 4 files changed, 15 insertions(+), 48 deletions(-)

diff --git a/src/Utils.cpp b/src/Utils.cpp
index 3a6266b7..38b5478d 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -378,8 +378,7 @@ obs_source_t* Utils::GetTransitionFromName(QString searchName) {
 		QString transitionName = obs_source_get_name(transition);
 
 		if (transitionName == searchName) {
-			foundTransition = transition;
-			obs_source_addref(foundTransition);
+			foundTransition = obs_source_get_ref(transition);
 			break;
 		}
 	}
diff --git a/src/WSRequestHandler_Recording.cpp b/src/WSRequestHandler_Recording.cpp
index e00e4555..efa5fc02 100644
--- a/src/WSRequestHandler_Recording.cpp
+++ b/src/WSRequestHandler_Recording.cpp
@@ -6,15 +6,6 @@
 #include "Utils.h"
 #include "WSEvents.h"
 
-RpcResponse ifCanPause(const RpcRequest& request, std::function<RpcResponse()> callback)
-{
-	if (!obs_frontend_recording_active()) {
-		return request.failed("recording is not active");
-	}
-
-	return callback();
-}
-
  /**
  * Get current recording status.
  *
@@ -103,14 +94,14 @@ RpcResponse WSRequestHandler::StartRecording(const RpcRequest& request) {
 * @since 4.7.0
 */
 RpcResponse WSRequestHandler::PauseRecording(const RpcRequest& request) {
-	return ifCanPause(request, [request]() {
-		if (obs_frontend_recording_paused()) {
-			return request.failed("recording already paused");
-		}
+	if (!obs_frontend_recording_active())
+		return request.failed("recording is not active");
 
-		obs_frontend_recording_pause(true);
-		return request.success();
-	});
+	if (obs_frontend_recording_paused())
+		return request.failed("recording already paused");
+
+	obs_frontend_recording_pause(true);
+	return request.success();
 }
 
 /**
@@ -123,14 +114,14 @@ RpcResponse WSRequestHandler::PauseRecording(const RpcRequest& request) {
 * @since 4.7.0
 */
 RpcResponse WSRequestHandler::ResumeRecording(const RpcRequest& request) {
-	return ifCanPause(request, [request]() {
-		if (!obs_frontend_recording_paused()) {
-			return request.failed("recording is not paused");
-		}
+	if (!obs_frontend_recording_active())
+		return request.failed("recording is not active");
 
-		obs_frontend_recording_pause(false);
-		return request.success();
-	});
+	if (!obs_frontend_recording_paused())
+		return request.failed("recording is not paused");
+
+	obs_frontend_recording_pause(false);
+	return request.success();
 }
 
 /**
diff --git a/src/obs-websocket.cpp b/src/obs-websocket.cpp
index 7e030c52..b4813635 100644
--- a/src/obs-websocket.cpp
+++ b/src/obs-websocket.cpp
@@ -30,12 +30,6 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include "Config.h"
 #include "forms/settings-dialog.h"
 
-void ___source_dummy_addref(obs_source_t*) {}
-void ___sceneitem_dummy_addref(obs_sceneitem_t*) {}
-void ___data_dummy_addref(obs_data_t*) {}
-void ___data_array_dummy_addref(obs_data_array_t*) {}
-void ___output_dummy_addref(obs_output_t*) {}
-
 void ___data_item_dummy_addref(obs_data_item_t*) {}
 void ___data_item_release(obs_data_item_t* dataItem) {
 	obs_data_item_release(&dataItem);
diff --git a/src/obs-websocket.h b/src/obs-websocket.h
index 7f46a5ce..3881739e 100644
--- a/src/obs-websocket.h
+++ b/src/obs-websocket.h
@@ -21,23 +21,6 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include <obs.hpp>
 #include <memory>
 
-void ___source_dummy_addref(obs_source_t*);
-void ___sceneitem_dummy_addref(obs_sceneitem_t*);
-void ___data_dummy_addref(obs_data_t*);
-void ___data_array_dummy_addref(obs_data_array_t*);
-void ___output_dummy_addref(obs_output_t*);
-
-using OBSSourceAutoRelease =
-	OBSRef<obs_source_t*, ___source_dummy_addref, obs_source_release>;
-using OBSSceneItemAutoRelease =
-	OBSRef<obs_sceneitem_t*, ___sceneitem_dummy_addref, obs_sceneitem_release>;
-using OBSDataAutoRelease =
-	OBSRef<obs_data_t*, ___data_dummy_addref, obs_data_release>;
-using OBSDataArrayAutoRelease =
-	OBSRef<obs_data_array_t*, ___data_array_dummy_addref, obs_data_array_release>;
-using OBSOutputAutoRelease =
-	OBSRef<obs_output_t*, ___output_dummy_addref, obs_output_release>;
-
 void ___data_item_dummy_addref(obs_data_item_t*);
 void ___data_item_release(obs_data_item_t*);
 using OBSDataItemAutoRelease =