mac: remove runtime checks and compatibility for macOS older than 10.15

we stopped supporting macOS older than 10.15 and hence can remove all the unnecessary runtime checks and compatibility layers.
mpv-player · Nov 9, 2023 · 23de1de · 23de1de · barracuda156 · Dec 24, 2023
1 parent a5bf211
commit 23de1de
Show file tree

Hide file tree

Showing 17 changed files with 47 additions and 214 deletions.
diff --git a/osdep/macos/remote_command_center.swift b/osdep/macos/remote_command_center.swift
@@ -17,7 +17,6 @@
 
 import MediaPlayer
 
-@available(macOS 10.12.2, *)
 class RemoteCommandCenter: NSObject {
     enum KeyType {
         case normal
@@ -105,9 +104,7 @@ class RemoteCommandCenter: NSObject {
             }
         }
 
-        if let app = NSApp as? Application, let icon = app.getMPVIcon(),
-               #available(macOS 10.13.2, *)
-        {
+        if let app = NSApp as? Application, let icon = app.getMPVIcon() {
             let albumArt = MPMediaItemArtwork(boundsSize: icon.size) { _ in
                 return icon
             }

diff --git a/osdep/macos/swift_compat.swift b/osdep/macos/swift_compat.swift
@@ -15,23 +15,6 @@
  * License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-extension NSPasteboard.PasteboardType {
-    static let fileURLCompat: NSPasteboard.PasteboardType = {
-        if #available(OSX 10.13, *) {
-            return .fileURL
-        } else {
-            return NSPasteboard.PasteboardType(kUTTypeURL as String)
-        }
-    } ()
-
-    static let URLCompat: NSPasteboard.PasteboardType = {
-        if #available(OSX 10.13, *) {
-            return .URL
-        } else {
-            return NSPasteboard.PasteboardType(kUTTypeFileURL as String)
-        }
-    } ()
-}
 
 #if !swift(>=5.0)
 extension Data {

diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m
@@ -26,7 +26,6 @@
 #include "options/options.h"
 
 #import "osdep/macosx_application_objc.h"
-#include "osdep/macosx_compat.h"
 #import "osdep/macosx_events_objc.h"
 #include "osdep/threads.h"
 #include "osdep/main-fn.h"
@@ -177,8 +176,7 @@ - (NSTouchBar *)makeTouchBar
 - (void)processEvent:(struct mpv_event *)event
 {
 #if HAVE_MACOS_TOUCHBAR
-    if ([self respondsToSelector:@selector(touchBar)])
-        [(TouchBar *)self.touchBar processEvent:event];
+    [(TouchBar *)self.touchBar processEvent:event];
 #endif
     if (_cocoa_cb) {
         [_cocoa_cb processEvent:event];

diff --git a/osdep/macosx_compat.h b/osdep/macosx_compat.h
diff --git a/osdep/macosx_events.m b/osdep/macosx_events.m
@@ -33,7 +33,6 @@
 // doesn't make much sense, but needed to access keymap functionality
 #include "video/out/vo.h"
 
-#include "osdep/macosx_compat.h"
 #import "osdep/macosx_events_objc.h"
 #import "osdep/macosx_application_objc.h"
 
@@ -299,8 +298,7 @@ -(void)processEvent:(struct mpv_event *)event
 - (void)startMediaKeys
 {
 #if HAVE_MACOS_MEDIA_PLAYER
-    // 10.12.2 runtime availability check
-    if (_remoteCommandCenter == nil && [NSApp respondsToSelector:@selector(touchBar)]) {
+    if (_remoteCommandCenter == nil) {
         _remoteCommandCenter = [[RemoteCommandCenter alloc] init];
     }
 #endif

diff --git a/osdep/macosx_menubar.m b/osdep/macosx_menubar.m
@@ -20,7 +20,6 @@
 
 #import "macosx_menubar_objc.h"
 #import "osdep/macosx_application_objc.h"
-#include "osdep/macosx_compat.h"
 
 @implementation MenuBar
 {
@@ -34,9 +33,7 @@ - (id)init
         [userDefaults setBool:NO forKey:@"NSFullScreenMenuItemEverywhere"];
         [userDefaults setBool:YES forKey:@"NSDisabledDictationMenuItem"];
         [userDefaults setBool:YES forKey:@"NSDisabledCharacterPaletteMenuItem"];
-
-        if ([NSWindow respondsToSelector:@selector(setAllowsAutomaticWindowTabbing:)])
-            [NSWindow setAllowsAutomaticWindowTabbing: NO];
+        [NSWindow setAllowsAutomaticWindowTabbing: NO];
 
         menuTree = @[
             @{
@@ -640,8 +637,7 @@ - (NSMenu *)mainMenu
 
 #if HAVE_MACOS_TOUCHBAR
             if ([action isEqual:@"toggleTouchBarCustomizationPalette:"]) {
-                if (![NSApp respondsToSelector:@selector(touchBar)])
-                    continue;
+                continue;
             }
 #endif
 

diff --git a/osdep/macosx_versions.h b/osdep/macosx_versions.h
diff --git a/video/out/cocoa/events_view.m b/video/out/cocoa/events_view.m
@@ -18,7 +18,6 @@
 #include "input/input.h"
 #include "input/keycodes.h"
 
-#include "osdep/macosx_compat.h"
 #include "video/out/cocoa_common.h"
 #include "events_view.h"
 

diff --git a/video/out/cocoa/video_view.m b/video/out/cocoa/video_view.m
@@ -15,7 +15,6 @@
  * License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "osdep/macosx_compat.h"
 #include "video/out/cocoa_common.h"
 #include "video_view.h"
 

diff --git a/video/out/cocoa/window.m b/video/out/cocoa/window.m
@@ -20,7 +20,6 @@
 #include "input/keycodes.h"
 
 #include "osdep/macosx_events.h"
-#include "osdep/macosx_compat.h"
 #include "video/out/cocoa_common.h"
 
 #include "window.h"

diff --git a/video/out/cocoa_cb_common.swift b/video/out/cocoa_cb_common.swift
@@ -121,9 +121,7 @@ class CocoaCB: Common {
         }
 
         libmpv.setRenderICCProfile(colorSpace)
-        if #available(macOS 10.11, *) {
-            layer?.colorspace = colorSpace.cgColorSpace
-        }
+        layer?.colorspace = colorSpace.cgColorSpace
     }
 
     override func windowDidEndAnimation() {

diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
@@ -32,7 +32,6 @@
 #import "video/out/cocoa/mpvadapter.h"
 
 #include "osdep/threads.h"
-#include "osdep/macosx_compat.h"
 #include "osdep/macosx_events_objc.h"
 
 #include "osdep/timer.h"

diff --git a/video/out/mac/common.swift b/video/out/mac/common.swift
@@ -164,17 +164,6 @@ class Common: NSObject {
         view?.removeFromSuperview()
     }
 
-    let linkCallback: CVDisplayLinkOutputCallback = {
-                    (displayLink: CVDisplayLink,
-                           inNow: UnsafePointer<CVTimeStamp>,
-                    inOutputTime: UnsafePointer<CVTimeStamp>,
-                         flagsIn: CVOptionFlags,
-                        flagsOut: UnsafeMutablePointer<CVOptionFlags>,
-              displayLinkContext: UnsafeMutableRawPointer?) -> CVReturn in
-        let com = unsafeBitCast(displayLinkContext, to: Common.self)
-        return com.displayLinkCallback(displayLink, inNow, inOutputTime, flagsIn, flagsOut)
-    }
-
     func displayLinkCallback(_ displayLink: CVDisplayLink,
                                    _ inNow: UnsafePointer<CVTimeStamp>,
                             _ inOutputTime: UnsafePointer<CVTimeStamp>,
@@ -195,12 +184,8 @@ class Common: NSObject {
         }
 
         CVDisplayLinkSetCurrentCGDisplay(link, screen.displayID)
-        if #available(macOS 10.12, *) {
-            CVDisplayLinkSetOutputHandler(link) { link, now, out, inFlags, outFlags -> CVReturn in
-                return self.displayLinkCallback(link, now, out, inFlags, outFlags)
-            }
-        } else {
-            CVDisplayLinkSetOutputCallback(link, linkCallback, MPVHelper.bridge(obj: self))
+        CVDisplayLinkSetOutputHandler(link) { link, now, out, inFlags, outFlags -> CVReturn in
+            return self.displayLinkCallback(link, now, out, inFlags, outFlags)
         }
         CVDisplayLinkStart(link)
     }

diff --git a/video/out/mac/gl_layer.swift b/video/out/mac/gl_layer.swift
@@ -109,7 +109,7 @@ class GLLayer: CAOpenGLLayer {
         autoresizingMask = [.layerWidthSizable, .layerHeightSizable]
         backgroundColor = NSColor.black.cgColor
 
-        if #available(macOS 10.12, *), bufferDepth > 8 {
+        if bufferDepth > 8 {
             contentsFormat = .RGBA16Float
         }