From 02a0b92d9de9b7107e1fb934afc8a911061171d3 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 17 Oct 2014 21:26:52 -0700 Subject: [PATCH] gl/cocoa: Fix for building on Mac OS X 10.10 Using NSApp directly seems to confuse something, as the compiler was expecting an id. Switched to using [NSApplication sharedApplication], and specified the delegate protocol on the window class as well. https://bugzilla.gnome.org/show_bug.cgi?id=738740 --- gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m b/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m index 27b9c3ad49..b3ac37a501 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,7 +138,7 @@ gst_gl_window_cocoa_create_window (GstGLWindowCocoa *window_cocoa, NSRect rect) GST_DEBUG ("NSWindow id: %"G_GUINTPTR_FORMAT, (guintptr) priv->internal_win_id); - [NSApp setDelegate: priv->internal_win_id]; + [[NSApplication sharedApplication] setDelegate: priv->internal_win_id]; return TRUE; }