mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-10 09:25:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl/cocoa: Let ARC clean up our dispatch queue if ARC is used, and otherwise do it manually

Browse source 
Also don't use __bridge casts if ARC is not used, as is the case on 32
bit systems.
This commit is contained in:
Sebastian Dröge 2018-04-25 01:33:43 +03:00
parent c6f4b5a14f
commit fac9f88f06
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m
View file

@ -137,14 +137,27 @@ gst_gl_window_cocoa_init (GstGLWindowCocoa * window)
window->priv->preferred_width = 320; window->priv->preferred_width = 320;
window->priv->preferred_height = 240; window->priv->preferred_height = 240;
#if OS_OBJECT_USE_OBJC
window->priv->gl_queue = (__bridge_retained gpointer) window->priv->gl_queue = (__bridge_retained gpointer)
(dispatch_queue_create ("org.freedesktop.gstreamer.glwindow", NULL)); (dispatch_queue_create ("org.freedesktop.gstreamer.glwindow", NULL));
#else
window->priv->gl_queue = (gpointer)
(dispatch_queue_create ("org.freedesktop.gstreamer.glwindow", NULL));
#endif
} }
static void static void
gst_gl_window_cocoa_finalize (GObject * object) gst_gl_window_cocoa_finalize (GObject * object)
{ {
GstGLWindowCocoa *window = GST_GL_WINDOW_COCOA (object); GstGLWindowCocoa *window = GST_GL_WINDOW_COCOA (object);
#if OS_OBJECT_USE_OBJC
/* Let ARC clean up our queue */
dispatch_queue_t queue = (__bridge_transfer dispatch_queue_t) window->priv->gl_queue;
#else
dispatch_release (window->priv->gl_queue);
#endif
window->priv->gl_queue = NULL; window->priv->gl_queue = NULL;
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
@ -431,7 +444,11 @@ gst_gl_window_cocoa_send_message_async (GstGLWindow * window,
GstGLContext *context = gst_gl_window_get_context (window); GstGLContext *context = gst_gl_window_get_context (window);
GThread *thread = gst_gl_context_get_thread (context); GThread *thread = gst_gl_context_get_thread (context);
GstGLWindowCocoaPrivate *priv = window_cocoa->priv; GstGLWindowCocoaPrivate *priv = window_cocoa->priv;
#if OS_OBJECT_USE_OBJC
dispatch_queue_t gl_queue = (__bridge dispatch_queue_t)priv->gl_queue; dispatch_queue_t gl_queue = (__bridge dispatch_queue_t)priv->gl_queue;
#else
dispatch_queue_t gl_queue = (dispatch_queue_t)priv->gl_queue;
#endif
if (thread == g_thread_self()) { if (thread == g_thread_self()) {
/* this case happens for nested calls happening from inside the GCD queue */ /* this case happens for nested calls happening from inside the GCD queue */