From 846d52ebe58d5f9f819680afa9d8a3e7516ab380 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Sun, 29 Mar 2020 16:09:16 +0200 Subject: [PATCH 1/2] requests(gdiplus source): allow functions to operate on v2 sources --- src/WSRequestHandler_Sources.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/WSRequestHandler_Sources.cpp b/src/WSRequestHandler_Sources.cpp index e043ee0e..036f987e 100644 --- a/src/WSRequestHandler_Sources.cpp +++ b/src/WSRequestHandler_Sources.cpp @@ -8,6 +8,11 @@ #include "WSRequestHandler.h" +bool isTextGDIPlusSource(const QString& sourceKind) +{ + return (sourceKind == "text_gdiplus" || sourceKind == "text_gdiplus_v2"); +} + /** * List all sources available in the running OBS instance * @@ -536,8 +541,8 @@ RpcResponse WSRequestHandler::GetTextGDIPlusProperties(const RpcRequest& request return request.failed("specified source doesn't exist"); } - QString sourceId = obs_source_get_id(source); - if (sourceId != "text_gdiplus") { + QString sourceKind = obs_source_get_id(source); + if (!isTextGDIPlusSource(sourceKind)) { return request.failed("not a text gdi plus source"); } @@ -601,8 +606,8 @@ RpcResponse WSRequestHandler::SetTextGDIPlusProperties(const RpcRequest& request return request.failed("specified source doesn't exist"); } - QString sourceId = obs_source_get_id(source); - if (sourceId != "text_gdiplus") { + QString sourceKind = obs_source_get_id(source); + if (!isTextGDIPlusSource(sourceKind)) { return request.failed("not a text gdi plus source"); } From 898e761988cd051da11d00db0d724c9cb562bafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lepin?= Date: Sun, 29 Mar 2020 16:13:28 +0200 Subject: [PATCH 2/2] requests(freetype2 source): allow functions to operate on v2 sources --- src/WSRequestHandler_Sources.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/WSRequestHandler_Sources.cpp b/src/WSRequestHandler_Sources.cpp index 036f987e..579f76b4 100644 --- a/src/WSRequestHandler_Sources.cpp +++ b/src/WSRequestHandler_Sources.cpp @@ -13,6 +13,11 @@ bool isTextGDIPlusSource(const QString& sourceKind) return (sourceKind == "text_gdiplus" || sourceKind == "text_gdiplus_v2"); } +bool isTextFreeType2Source(const QString& sourceKind) +{ + return (sourceKind == "text_ft2" || sourceKind == "text_ft2_v2"); +} + /** * List all sources available in the running OBS instance * @@ -772,8 +777,8 @@ RpcResponse WSRequestHandler::GetTextFreetype2Properties(const RpcRequest& reque return request.failed("specified source doesn't exist"); } - QString sourceId = obs_source_get_id(source); - if (sourceId != "text_ft2_source") { + QString sourceKind = obs_source_get_id(source); + if (!isTextFreeType2Source(sourceKind)) { return request.failed("not a freetype 2 source"); } @@ -820,8 +825,8 @@ RpcResponse WSRequestHandler::SetTextFreetype2Properties(const RpcRequest& reque return request.failed("specified source doesn't exist"); } - QString sourceId = obs_source_get_id(source); - if (sourceId != "text_ft2_source") { + QString sourceKind = obs_source_get_id(source); + if (!isTextFreeType2Source(sourceKind)) { return request.failed("not text freetype 2 source"); }