From c3f86ece4830563039594f686bf1657040453e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 8 Jan 2015 09:35:23 +0100 Subject: [PATCH] gl/cocoa: Don't init and clear static GMutex / GCond We would potentially use it from the main loop later in gst_gl_window_cocoa_init_nsapp() if it timed out before. --- gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m b/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m index 84e3a99293..a1746d1f42 100644 --- a/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m +++ b/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m @@ -166,9 +166,6 @@ gst_gl_context_cocoa_class_init (GstGLContextCocoaClass * klass) } else { /* Main loop running on the default main context but it * is not running in this thread */ - g_mutex_init (&nsapp_lock); - g_cond_init (&nsapp_cond); - g_mutex_lock (&nsapp_lock); g_idle_add_full (G_PRIORITY_HIGH, gst_gl_window_cocoa_init_nsapp, NULL, NULL); end_time = g_get_monotonic_time () + 500 * 1000; @@ -178,9 +175,6 @@ gst_gl_context_cocoa_class_init (GstGLContextCocoaClass * klass) if (!is_loop_running) { GST_WARNING ("no mainloop running"); } - - g_cond_clear (&nsapp_cond); - g_mutex_clear (&nsapp_lock); } }