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

macosx_application: implement "Quit & remember position" 

Add a menu item to quit and save the current playback position using the code
added with commit ce9a854.

Fixes #85
This commit is contained in:
Stefano Pigozzi 2013-05-23 09:44:56 +02:00
parent 60a7f3b8bc
commit 29f5429223
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/mplayer.c
View File

@ -3969,7 +3969,7 @@ static void init_input(struct MPContext *mpctx)
stream_set_interrupt_callback(mp_input_check_interrupt, mpctx->input); stream_set_interrupt_callback(mp_input_check_interrupt, mpctx->input);
#ifdef CONFIG_COCOA #ifdef CONFIG_COCOA
cocoa_set_state(mpctx->input, mpctx->key_fifo); cocoa_set_input_context(mpctx->input);
#endif #endif
} }

2
osdep/macosx_application.h
View File

@ -49,7 +49,7 @@ void cocoa_run_runloop(void);
void cocoa_stop_runloop(void); void cocoa_stop_runloop(void);
void cocoa_post_fake_event(void); void cocoa_post_fake_event(void);
void cocoa_set_state(struct input_ctx *input_context, struct mp_fifo *key_fifo); void cocoa_set_input_context(struct input_ctx *input_context);
void macosx_finder_args_preinit(int *argc, char ***argv); void macosx_finder_args_preinit(int *argc, char ***argv);

25
osdep/macosx_application.m
View File

@ -86,6 +86,9 @@ static pthread_t playback_thread_id;
action:@selector(hide:) keyEquivalent: @"h"]; action:@selector(hide:) keyEquivalent: @"h"];
[self menuItemWithParent:menu title:@"Quit mpv" [self menuItemWithParent:menu title:@"Quit mpv"
action:@selector(stopPlayback) keyEquivalent: @"q"]; action:@selector(stopPlayback) keyEquivalent: @"q"];
[self menuItemWithParent:menu title:@"Quit mpv & remember position"
action:@selector(stopPlaybackAndRememberPosition)
keyEquivalent: @"Q"];
return [menu autorelease]; return [menu autorelease];
} }
@ -120,13 +123,25 @@ static pthread_t playback_thread_id;
- (void)stopPlayback - (void)stopPlayback
{ {
if (app.keyFIFO) { [self stop:"quit"];
mplayer_put_key(app.keyFIFO, MP_KEY_CLOSE_WIN); }
- (void)stopPlaybackAndRememberPosition
{
[self stop:"quit_watch_later"];
}
- (void)stop:(char *)cmd
{
if (self.inputContext) {
mp_cmd_t *cmdt = mp_input_parse_cmd(bstr0(cmd), "");
mp_input_queue_cmd(self.inputContext, cmdt);
} else { } else {
terminate_cocoa_application(); terminate_cocoa_application();
} }
} }
- (void)registerMenuItem:(NSMenuItem*)menuItem forKey:(MPMenuKey)key - (void)registerMenuItem:(NSMenuItem*)menuItem forKey:(MPMenuKey)key
{ {
[self.menuItems setObject:menuItem forKey:[NSNumber numberWithInt:key]]; [self.menuItems setObject:menuItem forKey:[NSNumber numberWithInt:key]];
@ -295,12 +310,10 @@ void cocoa_stop_runloop(void)
cocoa_post_fake_event(); cocoa_post_fake_event();
} }
void cocoa_set_state(struct input_ctx *input_context, void cocoa_set_input_context(struct input_ctx *input_context)
struct mp_fifo *key_fifo)
{ {
[NSApp setDelegate:app]; [NSApp setDelegate:app];
app.inputContext = input_context; app.inputContext = input_context;
app.keyFIFO = key_fifo;
} }
void cocoa_post_fake_event(void) void cocoa_post_fake_event(void)