mirror of
https://github.com/mpv-player/mpv.git
synced 2025-12-28 05:33:14 +00:00
213ad5d6c4
This commit addresses some issues with the users had with the previous
implementation in commit c39efb9. Here's the changes:
* Use Quartz Event Taps to remove Media Key events mpv handles from
the global OS X queue. This prevents conflicts with iTunes. I did this on
the main thread since it is mostly idling. It's the playloop thread that
actually does all the work so there is no danger of blocking the event tap
callback.
* Introduce `--no-media-keys` switch so that users can disable all of mpv's
media key handling at runtime (some prefer iTunes for example).
* Use mpv's bindings so that users can customize what the media keys do via
input.conf. Current bindings are:
MK_PLAY cycle pause
MK_PREV playlist_prev
MK_NEXT playlist_next
An additional benefit of this implementation is that it is completly handled
by the `macosx_events` file instead of `macosx_application` making the
project organization more straightforward.
57 lines
1.8 KiB
Objective-C
57 lines
1.8 KiB
Objective-C
/*
|
|
* This file is part of mpv.
|
|
*
|
|
* mpv is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 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 General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with mpv; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#import <Cocoa/Cocoa.h>
|
|
#import "ar/HIDRemote.h"
|
|
#include "osdep/macosx_application.h"
|
|
|
|
struct cocoa_input_queue;
|
|
|
|
@interface InputQueue : NSObject
|
|
- (void)push:(int)keycode;
|
|
- (int) pop;
|
|
@end
|
|
|
|
@interface EventsResponder : NSObject <HIDRemoteDelegate>
|
|
- (BOOL)handleMediaKey:(int)key;
|
|
- (NSEvent *)handleKeyDown:(NSEvent *)event;
|
|
- (void)startAppleRemote;
|
|
- (void)stopAppleRemote;
|
|
- (void)startMediaKeys;
|
|
- (void)restartMediaKeys;
|
|
- (void)stopMediaKeys;
|
|
@property(nonatomic, retain) HIDRemote *remote;
|
|
@end
|
|
|
|
@interface Application : NSApplication
|
|
- (void)initialize_menu;
|
|
- (void)registerSelector:(SEL)selector forKey:(MPMenuKey)key;
|
|
- (void)stopPlayback;
|
|
|
|
@property(nonatomic, assign) struct input_ctx *inputContext;
|
|
@property(nonatomic, assign) struct mp_fifo *keyFIFO;
|
|
@property(nonatomic, retain) InputQueue *iqueue;
|
|
@property(nonatomic, retain) EventsResponder *eventsResponder;
|
|
@property(nonatomic, retain) NSMutableDictionary *menuItems;
|
|
@property(nonatomic, retain) NSArray *files;
|
|
@property(nonatomic, retain) NSMutableArray *argumentsList;
|
|
@property(nonatomic, assign) BOOL willStopOnOpenEvent;
|
|
@end
|
|
|
|
Application *mpv_shared_app(void);
|