mac/touchbar: use KVO block API instead of old obj-c instance method

der richter committed 2 years ago

Commit 6df06e51 parent 69d70141 file · +5 −10Browse files

Unified · Split

     var event: EventHelper? { get { return appHub.event } }
     var input: InputHelper { get { return appHub.input } }
     var configs: [NSTouchBarItem.Identifier:Config] = [:]
+    var observers: [NSKeyValueObservation] = []
     var isPaused: Bool = false { didSet { updatePlayButton() } }
     var position: Double = 0 { didSet { updateTouchBarTimeItems() } }
     var duration: Double = 0 { didSet { updateTouchBarTimeItems() } }
         defaultItemIdentifiers = [.play, .previousItem, .nextItem, .seekBar]
         customizationAllowedItemIdentifiers = [.play, .seekBar, .previousItem, .nextItem,
             .previousChapter, .nextChapter, .cycleAudio, .cycleSubtitle, .currentPosition, .timeLeft]
-        addObserver(self, forKeyPath: "visible", options: [.new], context: nil)
+        observers += [observe(\.isVisible, options: [.new]) { object, change in self.changed(visibility: change.newValue) }]
         event?.subscribe(self, event: .init(name: "duration", format: MPV_FORMAT_DOUBLE))
         event?.subscribe(self, event: .init(name: "time-pos", format: MPV_FORMAT_DOUBLE))
         item.view = config.handler(config)
         item.customizationLabel = config.name
         configs[identifier]?.item = item
-        item.addObserver(self, forKeyPath: "visible", options: [.new], context: nil)
+        observers += [item.observe(\.isVisible, options: [.new]) { object, change in self.changed(visibility: change.newValue) }]
         return item
     }
         return slider
     }
-    override func observeValue(
+    func changed(visibility: Bool?) {
-        forKeyPath keyPath: String?,
+        if let visible = visibility, visible {
-        of object: Any?,
-        change: [NSKeyValueChangeKey:Any]?,
-        context: UnsafeMutableRawPointer?
-    ) {
-        guard let visible = change?[.newKey] as? Bool else { return }
-        if keyPath == "isVisible" && visible {
             updateTouchBarTimeItems()
             updatePlayButton()
         }

mac/touchbar: use KVO block API instead of old obj-c instance method

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code