mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 00:01:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl/cocoa: don't segfault if we have a NULL draw/resize/close callback

Browse source
This commit is contained in:
Matthew Waters 2015-01-28 17:59:42 +11:00
parent 8d5ba8d96a
commit f3273cafc4
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -266,8 +266,11 @@ gst_gl_window_cocoa_draw_thread (GstGLWindowCocoa *window_cocoa)
if (g_main_loop_is_running (priv->loop)) { if (g_main_loop_is_running (priv->loop)) {
if (![priv->internal_win_id isClosed]) { if (![priv->internal_win_id isClosed]) {
GstGLWindow *window = GST_GL_WINDOW (window_cocoa);
/* draw opengl scene in the back buffer */ /* draw opengl scene in the back buffer */
GST_GL_WINDOW (window_cocoa)->draw (GST_GL_WINDOW (window_cocoa)->draw_data); if (window->draw)
window->draw (window->draw_data);
} }
} }
} }
@ -439,7 +442,9 @@ close_window_cb (gpointer data)
GST_DEBUG ("user clicked the close button\n"); GST_DEBUG ("user clicked the close button\n");
[window_cocoa->priv->internal_win_id setClosed]; [window_cocoa->priv->internal_win_id setClosed];
gst_gl_window_send_message_async (GST_GL_WINDOW (window_cocoa), (GstGLWindowCB) close_window_cb, gst_object_ref (window_cocoa), (GDestroyNotify) gst_object_unref); gst_gl_window_send_message_async (GST_GL_WINDOW (window_cocoa),
(GstGLWindowCB) close_window_cb, gst_object_ref (window_cocoa),
(GDestroyNotify) gst_object_unref);
return YES; return YES;
} }
@ -563,7 +568,8 @@ resize_cb (gpointer data)
resize_data->bounds = bounds; resize_data->bounds = bounds;
resize_data->visibleRect = visibleRect; resize_data->visibleRect = visibleRect;
gst_gl_window_send_message_async (GST_GL_WINDOW (window_cocoa), (GstGLWindowCB) resize_cb, resize_data, (GDestroyNotify) g_free); gst_gl_window_send_message_async (GST_GL_WINDOW (window_cocoa),
(GstGLWindowCB) resize_cb, resize_data, (GDestroyNotify) g_free);
} }
} }