decklink: Use the macOS version of the SDK on macOS and not the Linux one
authorSebastian Dröge <sebastian@centricular.com>
Tue, 30 May 2023 12:27:21 +0000 (15:27 +0300)
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Wed, 7 Jun 2023 05:46:12 +0000 (05:46 +0000)
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4786>

subprojects/gst-plugins-bad/sys/decklink/gstdecklink.h

index 5481c7d..dd50e78 100644 (file)
 
 #include <stdint.h>
 
-#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 <CoreFoundation/CoreFoundation.h>
+#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)