mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-24 09:10:36 +00:00
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.
This commit is contained in:
parent
f0a75cf029
commit
67980f27ce
1 changed files with 4 additions and 4 deletions
|
@ -50,8 +50,8 @@
|
|||
#include <gst/gl/egl/gstglcontext_egl.h>
|
||||
#endif
|
||||
|
||||
#if GST_GL_HAVE_WINDOW_COCOA && GST_GL_HAVE_PLATFORM_COCOA && defined (HAVE_QT_MAC)
|
||||
#include <gst/gl/coaoa/gstgldisplay_cocoa.h>
|
||||
#if GST_GL_HAVE_WINDOW_COCOA && GST_GL_HAVE_PLATFORM_CGL && defined (HAVE_QT_MAC)
|
||||
#include <gst/gl/cocoa/gstgldisplay_cocoa.h>
|
||||
#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;
|
||||
|
|
Loading…
Reference in a new issue