mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-02 20:42:30 +00:00
Code Issues 1 Projects Releases Wiki Activity

qt: Use GST_GL_HAVE_PLATFORM_CGL instead of GST_GL_HAVE_PLATFORM_COCOA

Browse source 
The latter is not used/available anymore since years. Also fix a typo
in the include path for the Cocoa GL display header.
This commit is contained in:
Simon Himmelbauer 2017-05-18 15:23:14 +03:00 committed by Sebastian Dröge
parent 5178fcdfda
commit b33563294f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ext/qt/gstqtglutility.cc
View file

@ -50,8 +50,8 @@
#include <gst/gl/egl/gstglcontext_egl.h> #include <gst/gl/egl/gstglcontext_egl.h>
#endif #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)
#include <gst/gl/coaoa/gstgldisplay_cocoa.h> #include <gst/gl/cocoa/gstgldisplay_cocoa.h>
#endif #endif
#define GST_CAT_DEFAULT qt_gl_utils_debug #define GST_CAT_DEFAULT qt_gl_utils_debug
@ -123,7 +123,7 @@ gst_qt_get_gl_display ()
} }
#endif #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()) if (QString::fromUtf8 ("cocoa") == app->platformName())
display = (GstGLDisplay *) gst_gl_display_cocoa_new (); display = (GstGLDisplay *) gst_gl_display_cocoa_new ();
#endif #endif
@ -177,7 +177,7 @@ gst_qt_get_gl_wrapcontext (GstGLDisplay * display,
} }
#endif #endif
if (platform == 0) { 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; platform = GST_GL_PLATFORM_CGL;
#elif GST_GL_HAVE_WINDOW_EAGL && GST_GL_HAVE_PLATFORM_EAGL && defined (HAVE_QT_IOS) #elif GST_GL_HAVE_WINDOW_EAGL && GST_GL_HAVE_PLATFORM_EAGL && defined (HAVE_QT_IOS)
platform = GST_GL_PLATFORM_EAGL; platform = GST_GL_PLATFORM_EAGL;