From ab946cd41eb88a756f55f0724d5fd4266cdef917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 30 May 2023 15:27:21 +0300 Subject: [PATCH] decklink: Use the macOS version of the SDK on macOS and not the Linux one Part-of: --- subprojects/gst-plugins-bad/sys/decklink/gstdecklink.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/subprojects/gst-plugins-bad/sys/decklink/gstdecklink.h b/subprojects/gst-plugins-bad/sys/decklink/gstdecklink.h index 5481c7d5ea..dd50e7869d 100644 --- a/subprojects/gst-plugins-bad/sys/decklink/gstdecklink.h +++ b/subprojects/gst-plugins-bad/sys/decklink/gstdecklink.h @@ -28,10 +28,6 @@ #include -#ifdef G_OS_UNIX -#include "linux/DeckLinkAPI.h" -#endif - #ifdef G_OS_WIN32 #include "win/DeckLinkAPI.h" @@ -51,8 +47,7 @@ # define CONVERT_TO_COM_STRING(s) G_STMT_START { char * _s = (char *)s; s = _com_util::ConvertStringToBSTR(_s); g_free(_s); } G_STMT_END # endif /* __MINGW32__ */ #elif defined(__APPLE__) - -#include +#include "osx/DeckLinkAPI.h" #define COMSTR_T CFStringRef #define CONVERT_COM_STRING(s) G_STMT_START { CFStringRef _s = (CFStringRef)s; s = (char*) malloc(100); CFStringGetCString(_s, s, 100, kCFStringEncodingUTF8); CFRelease(_s); } G_STMT_END @@ -60,6 +55,8 @@ #define CONVERT_TO_COM_STRING(s) G_STMT_START { char * _s = (char *)s; s = CFStringCreateWithCString(kCFAllocatorDefault, _s, kCFStringEncodingUTF8); g_free(_s); } G_STMT_END #define WINAPI #else /* Linux */ +#include "linux/DeckLinkAPI.h" + #define COMSTR_T const char* #define CONVERT_COM_STRING(s) #define CONVERT_TO_COM_STRING(s)