Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #448 from Palakis/bugfix/text-gdiplus-v2

Browse Source 
Allow Get/Set text gdiplus/ft2 properties functions to operate on v2 sources
This commit is contained in:
Stéphane Lepin 2020-03-29 16:23:13 +02:00 committed by GitHub
commit 5e41eaf3dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/WSRequestHandler_Sources.cpp
View File

@ -8,6 +8,16 @@
#include "WSRequestHandler.h" #include "WSRequestHandler.h"
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 * List all sources available in the running OBS instance
* *
@ -536,8 +546,8 @@ RpcResponse WSRequestHandler::GetTextGDIPlusProperties(const RpcRequest& request
return request.failed("specified source doesn't exist"); return request.failed("specified source doesn't exist");
} }
QString sourceId = obs_source_get_id(source); QString sourceKind = obs_source_get_id(source);
if (sourceId != "text_gdiplus") { if (!isTextGDIPlusSource(sourceKind)) {
return request.failed("not a text gdi plus source"); return request.failed("not a text gdi plus source");
} }
@ -601,8 +611,8 @@ RpcResponse WSRequestHandler::SetTextGDIPlusProperties(const RpcRequest& request
return request.failed("specified source doesn't exist"); return request.failed("specified source doesn't exist");
} }
QString sourceId = obs_source_get_id(source); QString sourceKind = obs_source_get_id(source);
if (sourceId != "text_gdiplus") { if (!isTextGDIPlusSource(sourceKind)) {
return request.failed("not a text gdi plus source"); return request.failed("not a text gdi plus source");
} }
@ -767,8 +777,8 @@ RpcResponse WSRequestHandler::GetTextFreetype2Properties(const RpcRequest& reque
return request.failed("specified source doesn't exist"); return request.failed("specified source doesn't exist");
} }
QString sourceId = obs_source_get_id(source); QString sourceKind = obs_source_get_id(source);
if (sourceId != "text_ft2_source") { if (!isTextFreeType2Source(sourceKind)) {
return request.failed("not a freetype 2 source"); return request.failed("not a freetype 2 source");
} }
@ -815,8 +825,8 @@ RpcResponse WSRequestHandler::SetTextFreetype2Properties(const RpcRequest& reque
return request.failed("specified source doesn't exist"); return request.failed("specified source doesn't exist");
} }
QString sourceId = obs_source_get_id(source); QString sourceKind = obs_source_get_id(source);
if (sourceId != "text_ft2_source") { if (!isTextFreeType2Source(sourceKind)) {
return request.failed("not text freetype 2 source"); return request.failed("not text freetype 2 source");
} }