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

mac/remote: replace command handler with generic handler function config 

preparation for the upcoming changes for new functionality not related
to key handling.
This commit is contained in:
der richter 2024-02-06 22:46:58 +01:00
parent 05d0252a30
commit de36f11fa8
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
osdep/macos/remote_command_center.swift
View File

@ -18,6 +18,8 @@
import MediaPlayer import MediaPlayer
extension RemoteCommandCenter { extension RemoteCommandCenter {
typealias ConfigHandler = (MPRemoteCommandEvent) -> (MPRemoteCommandHandlerStatus)
enum KeyType { enum KeyType {
case normal case normal
case repeatable case repeatable
@ -27,10 +29,12 @@ extension RemoteCommandCenter {
let key: Int32 let key: Int32
let type: KeyType let type: KeyType
var state: UInt32 = 0 var state: UInt32 = 0
let handler: ConfigHandler
init(key: Int32, type: KeyType = .normal) { init(key: Int32, type: KeyType = .normal, handler: @escaping ConfigHandler = { event in return .commandFailed }) {
self.key = key self.key = key
self.type = type self.type = type
self.handler = handler
} }
} }
} }
@ -58,14 +62,14 @@ class RemoteCommandCenter: NSObject {
] ]
configs = [ configs = [
commandCenter.pauseCommand: Config(key: MP_KEY_PAUSEONLY), commandCenter.pauseCommand: Config(key: MP_KEY_PAUSEONLY, handler: keyHandler),
commandCenter.playCommand: Config(key: MP_KEY_PLAYONLY), commandCenter.playCommand: Config(key: MP_KEY_PLAYONLY, handler: keyHandler),
commandCenter.stopCommand: Config(key: MP_KEY_STOP), commandCenter.stopCommand: Config(key: MP_KEY_STOP, handler: keyHandler),
commandCenter.nextTrackCommand: Config(key: MP_KEY_NEXT), commandCenter.nextTrackCommand: Config(key: MP_KEY_NEXT, handler: keyHandler),
commandCenter.previousTrackCommand: Config(key: MP_KEY_PREV), commandCenter.previousTrackCommand: Config(key: MP_KEY_PREV, handler: keyHandler),
commandCenter.togglePlayPauseCommand: Config(key: MP_KEY_PLAY), commandCenter.togglePlayPauseCommand: Config(key: MP_KEY_PLAY, handler: keyHandler),
commandCenter.seekForwardCommand: Config(key: MP_KEY_FORWARD, type: .repeatable), commandCenter.seekForwardCommand: Config(key: MP_KEY_FORWARD, type: .repeatable, handler: keyHandler),
commandCenter.seekBackwardCommand: Config(key: MP_KEY_REWIND, type: .repeatable) commandCenter.seekBackwardCommand: Config(key: MP_KEY_REWIND, type: .repeatable, handler: keyHandler)
] ]
disabledCommands = [ disabledCommands = [
@ -96,11 +100,9 @@ class RemoteCommandCenter: NSObject {
} }
@objc func start() { @objc func start() {
for (cmd, _) in configs { for (cmd, config) in configs {
cmd.isEnabled = true cmd.isEnabled = true
cmd.addTarget { [unowned self] event in cmd.addTarget(handler: config.handler)
return self.cmdHandler(event)
}
} }
infoCenter.nowPlayingInfo = nowPlayingInfo infoCenter.nowPlayingInfo = nowPlayingInfo
@ -134,8 +136,8 @@ class RemoteCommandCenter: NSObject {
infoCenter.playbackState = isPaused ? .paused : .playing infoCenter.playbackState = isPaused ? .paused : .playing
} }
func cmdHandler(_ event: MPRemoteCommandEvent) -> MPRemoteCommandHandlerStatus { lazy var keyHandler: ConfigHandler = { event in
guard let config = configs[event.command] else { guard let config = self.configs[event.command] else {
return .commandFailed return .commandFailed
} }