From: Sebastian Dröge Date: Thu, 13 Nov 2014 11:01:25 +0000 (+0100) Subject: gl/cocoa: Don't override the application delegate X-Git-Tag: 1.19.3~511^2~1989^2~1202 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3fe5be7c9ae0c8f164e334f92ec59708f23876ca;p=platform%2Fupstream%2Fgstreamer.git gl/cocoa: Don't override the application delegate Otherwise interesting things will happen in Cocoa applications, like infinite event loops that block the NSApplication loop forever. This was only needed for GNUStep and thus can safely be removed now. --- diff --git a/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m b/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m index d776477..c909d58 100644 --- a/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m +++ b/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m @@ -33,7 +33,7 @@ /* */ /* =============================================================*/ -@interface GstGLNSWindow: NSWindow { +@interface GstGLNSWindow: NSWindow { BOOL m_isClosed; GstGLWindowCocoa *window_cocoa; } @@ -138,8 +138,6 @@ gst_gl_window_cocoa_create_window (GstGLWindowCocoa *window_cocoa, NSRect rect) GST_DEBUG ("NSWindow id: %"G_GUINTPTR_FORMAT, (guintptr) priv->internal_win_id); - [[NSApplication sharedApplication] setDelegate: priv->internal_win_id]; - return TRUE; } @@ -443,20 +441,6 @@ close_window_cb (gpointer data) return YES; } -- (void) applicationDidFinishLaunching: (NSNotification *) not { -} - -- (void) applicationWillFinishLaunching: (NSNotification *) not { -} - -- (BOOL) applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)app { - /* the application is manually stopped by calling stopApp on the AppThreadPerformer */ - return NO; -} - -- (void) applicationWillTerminate:(NSNotification *)aNotification { -} - @end