diff options
author | der richter <der.richter@gmx.de> | 2019-07-20 12:16:37 +0200 |
---|---|---|
committer | Jan Ekström <jeebjp@gmail.com> | 2019-07-21 18:13:07 +0300 |
commit | a8c2e2986838dccbcc4bd218b501f0bf86b36e2c (patch) | |
tree | 0f9ce3f16cc72c47dd70e9961e6c9b9f1cdabd43 /osdep/macOS_swift_extensions.swift | |
parent | 0602f082cb9775b4c9c8e256b1cb9de218a3b5fc (diff) | |
download | mpv-a8c2e2986838dccbcc4bd218b501f0bf86b36e2c.tar.bz2 mpv-a8c2e2986838dccbcc4bd218b501f0bf86b36e2c.tar.xz |
cocoa-cb: migrate to swift 5 with swift 4 fallback
this migrates our current swift code to version 5 and 4. building is
support from 10.12.6 and xcode 9.1 onwards.
dynamic linking is the new default, since Apple removed static libs
from their new toolchains and it's the recommended way.
additionally the found macOS SDK version is printed since it's an
important information for finding possible errors now.
Fixes #6470
Diffstat (limited to 'osdep/macOS_swift_extensions.swift')
-rw-r--r-- | osdep/macOS_swift_extensions.swift | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/osdep/macOS_swift_extensions.swift b/osdep/macOS_swift_extensions.swift index 7929d48f9a..1e30cf4df7 100644 --- a/osdep/macOS_swift_extensions.swift +++ b/osdep/macOS_swift_extensions.swift @@ -17,11 +17,15 @@ import Cocoa +extension NSDeviceDescriptionKey { + static let screenNumber = NSDeviceDescriptionKey("NSScreenNumber") +} + extension NSScreen { public var displayID: CGDirectDisplayID { get { - return deviceDescription["NSScreenNumber"] as? CGDirectDisplayID ?? 0 + return deviceDescription[.screenNumber] as? CGDirectDisplayID ?? 0 } } |