summaryrefslogtreecommitdiffstats
path: root/osdep
diff options
context:
space:
mode:
authorder richter <der.richter@gmx.de>2023-11-09 18:57:41 +0100
committerDudemanguy <random342@airmail.cc>2023-11-09 18:12:25 +0000
commit23de1deaaaace05bb9504567a852ac66e76a1ad1 (patch)
tree34569c067e22eaf0a6464ca3af0c412f394073ed /osdep
parenta5bf211e128b4fb916edcf5f46bd23d3ff222711 (diff)
downloadmpv-23de1deaaaace05bb9504567a852ac66e76a1ad1.tar.bz2
mpv-23de1deaaaace05bb9504567a852ac66e76a1ad1.tar.xz
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.
Diffstat (limited to 'osdep')
-rw-r--r--osdep/macos/remote_command_center.swift5
-rw-r--r--osdep/macos/swift_compat.swift17
-rw-r--r--osdep/macosx_application.m4
-rw-r--r--osdep/macosx_compat.h63
-rw-r--r--osdep/macosx_events.m4
-rw-r--r--osdep/macosx_menubar.m8
-rw-r--r--osdep/macosx_versions.h33
7 files changed, 5 insertions, 129 deletions
diff --git a/osdep/macos/remote_command_center.swift b/osdep/macos/remote_command_center.swift
index d97cb3328c..6fb2229f3a 100644
--- 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
index 1c8f28f810..83059dae5c 100644
--- 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
index 6b526d295c..ff8fac6cbb 100644
--- 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 @@ static const char macosx_icon[] =
- (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
deleted file mode 100644
index d5f8dab571..0000000000
--- a/osdep/macosx_compat.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Application Event Handling
- *
- * This file is part of mpv.
- *
- * mpv is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * mpv is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with mpv. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef MPV_MACOSX_COMPAT
-#define MPV_MACOSX_COMPAT
-
-#import <Cocoa/Cocoa.h>
-#include "osdep/macosx_versions.h"
-
-#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12)
-
-@interface NSWindow (macOS10_12_SDK)
-+ (void)setAllowsAutomaticWindowTabbing:(BOOL)allow;
-@end
-
-typedef NSUInteger NSWindowStyleMask;
-static const NSWindowStyleMask NSWindowStyleMaskClosable = NSClosableWindowMask;
-static const NSWindowStyleMask NSWindowStyleMaskTitled = NSTitledWindowMask;
-static const NSWindowStyleMask NSWindowStyleMaskMiniaturizable = NSMiniaturizableWindowMask;
-static const NSWindowStyleMask NSWindowStyleMaskResizable = NSResizableWindowMask;
-static const NSWindowStyleMask NSWindowStyleMaskBorderless = NSBorderlessWindowMask;
-static const NSWindowStyleMask NSWindowStyleMaskFullScreen = NSFullScreenWindowMask;
-
-static const NSEventType NSEventTypeSystemDefined = NSSystemDefined;
-static const NSEventType NSEventTypeKeyDown = NSKeyDown;
-static const NSEventType NSEventTypeKeyUp = NSKeyUp;
-
-static const NSEventMask NSEventMaskLeftMouseUp = NSLeftMouseUpMask;
-
-#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_10)
-typedef NSUInteger NSEventModifierFlags;
-#endif
-
-static const NSEventModifierFlags NSEventModifierFlagShift = NSShiftKeyMask;
-static const NSEventModifierFlags NSEventModifierFlagControl = NSControlKeyMask;
-static const NSEventModifierFlags NSEventModifierFlagCommand = NSCommandKeyMask;
-static const NSEventModifierFlags NSEventModifierFlagOption = NSAlternateKeyMask;
-
-#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_9)
-typedef NSUInteger NSModalResponse;
-static const NSModalResponse NSModalResponseOK = NSFileHandlingPanelOKButton;
-#endif
-
-#endif
-
-#endif /* MPV_MACOSX_COMPAT */
diff --git a/osdep/macosx_events.m b/osdep/macosx_events.m
index 2a82b3d034..627077aac1 100644
--- 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 cocoa_set_mpv_handle(struct mpv_handle *ctx)
- (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
index c8255dd037..d9ee159d8a 100644
--- 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 @@
[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 @@
#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
deleted file mode 100644
index 29ab01eb5a..0000000000
--- a/osdep/macosx_versions.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of mpv.
- *
- * mpv is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * mpv is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with mpv. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef MPV_MACOSX_VERSIONS
-#define MPV_MACOSX_VERSIONS
-
-#if !defined(MAC_OS_X_VERSION_10_9)
-# define MAC_OS_X_VERSION_10_9 1090
-#endif
-
-#if !defined(MAC_OS_X_VERSION_10_10)
-# define MAC_OS_X_VERSION_10_10 101000
-#endif
-
-#if !defined(MAC_OS_X_VERSION_10_12)
-# define MAC_OS_X_VERSION_10_12 101200
-#endif
-
-#endif /* MPV_MACOSX_VERSIONS */