RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

mac/touchbar: use AppHub directly instead of the singleton

This commit is contained in:
der richter 2024-03-24 02:02:29 +01:00
parent 37b2e59787
commit b77d5386c3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osdep/mac/touch_bar.swift
View File

@ -71,6 +71,7 @@ extension TouchBar {
class TouchBar: NSTouchBar, NSTouchBarDelegate, EventSubscriber { class TouchBar: NSTouchBar, NSTouchBarDelegate, EventSubscriber {
unowned let appHub: AppHub unowned let appHub: AppHub
var event: EventHelper? { get { return appHub.event } } var event: EventHelper? { get { return appHub.event } }
var input: InputHelper { get { return appHub.input } }
var configs: [NSTouchBarItem.Identifier:Config] = [:] var configs: [NSTouchBarItem.Identifier:Config] = [:]
var isPaused: Bool = false { didSet { updatePlayButton() } } var isPaused: Bool = false { didSet { updatePlayButton() } }
var position: Double = 0 { didSet { updateTouchBarTimeItems() } } var position: Double = 0 { didSet { updateTouchBarTimeItems() } }
@ -234,12 +235,12 @@ class TouchBar: NSTouchBar, NSTouchBarDelegate, EventSubscriber {
@objc func buttonAction(_ button: NSButton) { @objc func buttonAction(_ button: NSButton) {
guard let identifier = getIdentifierFrom(view: button), let command = configs[identifier]?.command else { return } guard let identifier = getIdentifierFrom(view: button), let command = configs[identifier]?.command else { return }
AppHub.shared.input.command(command) input.command(command)
} }
@objc func seekbarChanged(_ slider: NSSlider) { @objc func seekbarChanged(_ slider: NSSlider) {
guard let identifier = getIdentifierFrom(view: slider), let command = configs[identifier]?.command else { return } guard let identifier = getIdentifierFrom(view: slider), let command = configs[identifier]?.command else { return }
AppHub.shared.input.command(String(format: command, slider.doubleValue)) input.command(String(format: command, slider.doubleValue))
} }
func format(time: Int) -> String { func format(time: Int) -> String {