From 6d0f0546ee851f4106438c5b92c8d1d152937ea7 Mon Sep 17 00:00:00 2001
From: der richter <der.richter@gmx.de>
Date: Sun, 29 Sep 2019 18:35:12 +0200
Subject: cocoa-cb: remove get_property_* usages and split up mpv helper

all the get_property_* usages were removed because in some circumstances
they can lead to deadlocks. they were replaced by accessing the vo and
mp_vo_opts structs directly, like on other vos.

additionally the mpv helper was split into a mpv and libmpv helper, to
differentiate between private and public APIs and for future changes
like a macOS vulkan context for vo=gpu.
---
 osdep/macOS_swift_extensions.swift | 75 --------------------------------------
 1 file changed, 75 deletions(-)
 delete mode 100644 osdep/macOS_swift_extensions.swift

(limited to 'osdep/macOS_swift_extensions.swift')

diff --git a/osdep/macOS_swift_extensions.swift b/osdep/macOS_swift_extensions.swift
deleted file mode 100644
index 1e30cf4df7..0000000000
--- a/osdep/macOS_swift_extensions.swift
+++ /dev/null
@@ -1,75 +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/>.
- */
-
-import Cocoa
-
-extension NSDeviceDescriptionKey {
-    static let screenNumber = NSDeviceDescriptionKey("NSScreenNumber")
-}
-
-extension NSScreen {
-
-    public var displayID: CGDirectDisplayID {
-        get {
-            return deviceDescription[.screenNumber] as? CGDirectDisplayID ?? 0
-        }
-    }
-
-    public var displayName: String? {
-        get {
-            var name: String? = nil
-            var object: io_object_t
-            var iter = io_iterator_t()
-            let matching = IOServiceMatching("IODisplayConnect")
-            let result = IOServiceGetMatchingServices(kIOMasterPortDefault, matching, &iter)
-
-            if result != KERN_SUCCESS || iter == 0 { return nil }
-
-            repeat {
-                object = IOIteratorNext(iter)
-                if let info = IODisplayCreateInfoDictionary(object, IOOptionBits(kIODisplayOnlyPreferredName)).takeRetainedValue() as? [String:AnyObject],
-                    (info[kDisplayVendorID] as? UInt32 == CGDisplayVendorNumber(displayID) &&
-                    info[kDisplayProductID] as? UInt32 == CGDisplayModelNumber(displayID) &&
-                    info[kDisplaySerialNumber] as? UInt32 ?? 0 == CGDisplaySerialNumber(displayID))
-                {
-                    if let productNames = info["DisplayProductName"] as? [String:String],
-                       let productName = productNames.first?.value
-                    {
-                        name = productName
-                        break
-                    }
-                }
-            } while object != 0
-
-            IOObjectRelease(iter)
-            return name
-        }
-    }
-}
-
-extension NSColor {
-
-    convenience init(hex: String) {
-        let int = Int(hex.dropFirst(), radix: 16) ?? 0
-        let alpha = CGFloat((int >> 24) & 0x000000FF)/255
-        let red   = CGFloat((int >> 16) & 0x000000FF)/255
-        let green = CGFloat((int >> 8)  & 0x000000FF)/255
-        let blue  = CGFloat((int)       & 0x000000FF)/255
-
-        self.init(calibratedRed: red, green: green, blue: blue, alpha: alpha)
-    }
-}
-- 
cgit v1.2.3