#include <gst/gl/egl/gstglcontext_egl.h>
#endif
-#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
GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
#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 ();
+ display = (GstGLDisplay *) gst_gl_display_new ();
#endif
#if GST_GL_HAVE_WINDOW_EAGL && GST_GL_HAVE_PLATFORM_EAGL && defined (HAVE_QT_IOS)
if (QString::fromUtf8 ("ios") == app->platformName())
#include <gst/gl/gl.h>
#include <Cocoa/Cocoa.h>
-#include <gst/gl/cocoa/gstglcontext_cocoa.h>
-
G_BEGIN_DECLS
@interface GstGLCAOpenGLLayer : CAOpenGLLayer {
@public
- GstGLContextCocoa *gst_gl_context;
+ GstGLContext *gst_gl_context;
CGLContextObj gl_context;
@private
- (void) setDrawCallback:(GstGLWindowCB)cb data:(gpointer)a notify:(GDestroyNotify)notify;
- (void) setResizeCallback:(GstGLWindowResizeCB)cb data:(gpointer)a notify:(GDestroyNotify)notify;
- (void) queueResize;
-- (id) initWithGstGLContext: (GstGLContextCocoa *)context;
+- (id) initWithGstGLContext: (GstGLContext *)context;
@end
G_END_DECLS
g_atomic_int_set (&ca_layer->can_draw, 1);
}
-- (id)initWithGstGLContext:(GstGLContextCocoa *)parent_gl_context {
+- (id)initWithGstGLContext:(GstGLContext *)parent_gl_context {
+ g_return_val_if_fail (GST_IS_GL_CONTEXT_COCOA (parent_gl_context), nil);
+
self = [super init];
_init_debug();
self->gst_gl_context = parent_gl_context;
self.needsDisplayOnBoundsChange = YES;
- gst_gl_window_send_message_async (GST_GL_CONTEXT (parent_gl_context)->window,
+ gst_gl_window_send_message_async (parent_gl_context->window,
(GstGLWindowCB) _context_ready, (__bridge_retained gpointer)self, (GDestroyNotify)CFRelease);
return self;
CGLPixelFormatObj fmt = NULL;
if (self->gst_gl_context)
- fmt = gst_gl_context_cocoa_get_pixel_format (self->gst_gl_context);
+ fmt = gst_gl_context_cocoa_get_pixel_format (GST_GL_CONTEXT_COCOA (self->gst_gl_context));
if (!fmt) {
CGLPixelFormatAttribute attribs[] = {
GError *error = NULL;
if (self->gst_gl_context)
- external_context = (CGLContextObj) gst_gl_context_get_gl_context (GST_GL_CONTEXT (self->gst_gl_context));
+ external_context = (CGLContextObj) gst_gl_context_get_gl_context (self->gst_gl_context);
GST_INFO ("attempting to create CGLContext for CAOpenGLLayer with "
"share context %p", external_context);
return NULL;
}
- display = gst_gl_context_get_display (GST_GL_CONTEXT (self->gst_gl_context));
+ display = gst_gl_context_get_display (self->gst_gl_context);
self->draw_context = gst_gl_context_new_wrapped (display,
(guintptr) self->gl_context, GST_GL_PLATFORM_CGL,
gst_gl_context_get_current_gl_api (GST_GL_PLATFORM_CGL, NULL, NULL));
}
gst_gl_context_activate (self->draw_context, TRUE);
- gst_gl_context_set_shared_with (self->draw_context, GST_GL_CONTEXT (self->gst_gl_context));
+ gst_gl_context_set_shared_with (self->draw_context, self->gst_gl_context);
if (!gst_gl_context_fill_info (self->draw_context, &error)) {
GST_ERROR ("failed to fill wrapped context information: %s", error->message);
return NULL;