From b33563294f6a2868b13cd3be66ed21b83ad19144 Mon Sep 17 00:00:00 2001 From: Simon Himmelbauer Date: Thu, 18 May 2017 15:23:14 +0300 Subject: [PATCH] qt: Use GST_GL_HAVE_PLATFORM_CGL instead of GST_GL_HAVE_PLATFORM_COCOA The latter is not used/available anymore since years. Also fix a typo in the include path for the Cocoa GL display header. --- ext/qt/gstqtglutility.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/qt/gstqtglutility.cc b/ext/qt/gstqtglutility.cc index 0867f35..d0f7668 100644 --- a/ext/qt/gstqtglutility.cc +++ b/ext/qt/gstqtglutility.cc @@ -50,8 +50,8 @@ #include #endif -#if GST_GL_HAVE_WINDOW_COCOA && GST_GL_HAVE_PLATFORM_COCOA && defined (HAVE_QT_MAC) -#include +#if GST_GL_HAVE_WINDOW_COCOA && GST_GL_HAVE_PLATFORM_CGL && defined (HAVE_QT_MAC) +#include #endif #define GST_CAT_DEFAULT qt_gl_utils_debug @@ -123,7 +123,7 @@ gst_qt_get_gl_display () } #endif -#if GST_GL_HAVE_WINDOW_COCOA && GST_GL_HAVE_PLATFORM_COCOA && defined (HAVE_QT_MAC) +#if GST_GL_HAVE_WINDOW_COCOA && GST_GL_HAVE_PLATFORM_CGL && defined (HAVE_QT_MAC) if (QString::fromUtf8 ("cocoa") == app->platformName()) display = (GstGLDisplay *) gst_gl_display_cocoa_new (); #endif @@ -177,7 +177,7 @@ gst_qt_get_gl_wrapcontext (GstGLDisplay * display, } #endif if (platform == 0) { -#if GST_GL_HAVE_WINDOW_COCOA && GST_GL_HAVE_PLATFORM_COCOA && defined (HAVE_QT_MAC) +#if GST_GL_HAVE_WINDOW_COCOA && GST_GL_HAVE_PLATFORM_CGL && defined (HAVE_QT_MAC) platform = GST_GL_PLATFORM_CGL; #elif GST_GL_HAVE_WINDOW_EAGL && GST_GL_HAVE_PLATFORM_EAGL && defined (HAVE_QT_IOS) platform = GST_GL_PLATFORM_EAGL; -- 2.7.4