From 88a4d06735c4c5649ead10725b95cb822c92aeae Mon Sep 17 00:00:00 2001 From: Josep Torra Date: Sat, 20 May 2017 12:16:50 +0200 Subject: [PATCH] cocoa: fix macOS 10.12 deprecation warnings Add #defines to allow older versions of macOS to use the new constant names. --- gst-libs/gst/gl/cocoa/gstgldisplay_cocoa.m | 6 +++++- gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m | 11 +++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/gst-libs/gst/gl/cocoa/gstgldisplay_cocoa.m b/gst-libs/gst/gl/cocoa/gstgldisplay_cocoa.m index 3fa88e6..9515629 100644 --- a/gst-libs/gst/gl/cocoa/gstgldisplay_cocoa.m +++ b/gst-libs/gst/gl/cocoa/gstgldisplay_cocoa.m @@ -34,6 +34,10 @@ G_DEFINE_TYPE (GstGLDisplayCocoa, gst_gl_display_cocoa, GST_TYPE_GL_DISPLAY); static void gst_gl_display_cocoa_finalize (GObject * object); static guintptr gst_gl_display_cocoa_get_handle (GstGLDisplay * display); +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 +#define NSEventMaskAny NSAnyEventMask +#endif + /* Define this if the GLib patch from * https://bugzilla.gnome.org/show_bug.cgi?id=741450 * is used @@ -56,7 +60,7 @@ gst_gl_display_cocoa_nsapp_iteration (gpointer data) } - while ((event = ([NSApp nextEventMatchingMask:NSAnyEventMask + while ((event = ([NSApp nextEventMatchingMask:NSEventMaskAny untilDate:[NSDate dateWithTimeIntervalSinceNow:0.05] inMode:NSDefaultRunLoopMode dequeue:YES])) != nil) { [NSApp sendEvent:event]; diff --git a/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m b/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m index 57d7dfe..7c01702 100644 --- a/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m +++ b/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m @@ -28,6 +28,13 @@ #include "gstgl_cocoa_private.h" +#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12 +#define NSWindowStyleMaskTitled NSTitledWindowMask +#define NSWindowStyleMaskClosable NSClosableWindowMask +#define NSWindowStyleMaskResizable NSResizableWindowMask +#define NSWindowStyleMaskMiniaturizable NSMiniaturizableWindowMask +#endif + /* =============================================================*/ /* */ /* GstGLNSWindow declaration */ @@ -175,8 +182,8 @@ gst_gl_window_cocoa_create_window (GstGLWindowCocoa *window_cocoa) gst_object_unref (context); internal_win_id = [[GstGLNSWindow alloc] initWithContentRect:rect styleMask: - (NSTitledWindowMask | NSClosableWindowMask | - NSResizableWindowMask | NSMiniaturizableWindowMask) + (NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | + NSWindowStyleMaskResizable | NSWindowStyleMaskMiniaturizable) backing: NSBackingStoreBuffered defer: NO screen: nil gstWin: window_cocoa]; priv->internal_win_id = (__bridge_retained gpointer)internal_win_id; -- 2.7.4