From fc7731983ee82e07fbc8835d2b94c40fdda2da81 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sun, 7 Dec 2014 21:39:26 +0100 Subject: cocoa: ignore first file open events from command line similar to some of the code deleted in 685b8b7a but simpler --- osdep/macosx_application.m | 8 ++++++++ osdep/macosx_application_objc.h | 1 + 2 files changed, 9 insertions(+) (limited to 'osdep') diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m index 98d00244fb..fa5058fd1d 100644 --- a/osdep/macosx_application.m +++ b/osdep/macosx_application.m @@ -61,6 +61,7 @@ Application *mpv_shared_app(void) @implementation Application @synthesize menuItems = _menu_items; +@synthesize openCount = _open_count; - (void)sendEvent:(NSEvent *)event { @@ -231,6 +232,10 @@ Application *mpv_shared_app(void) - (void)application:(NSApplication *)sender openFiles:(NSArray *)filenames { + if (mpv_shared_app().openCount > 0) { + mpv_shared_app().openCount--; + return; + } SEL cmpsel = @selector(localizedStandardCompare:); NSArray *files = [filenames sortedArrayUsingSelector:cmpsel]; [_eventsResponder handleFilesArray:files]; @@ -371,6 +376,9 @@ int cocoa_main(mpv_main_fn mpv_main, int argc, char *argv[]) macosx_redirect_output_to_logfile("mpv"); init_cocoa_application(true); } else { + for (int i = 1; i < argc; i++) + if (argv[i][0] != '-') + mpv_shared_app().openCount++; init_cocoa_application(false); } diff --git a/osdep/macosx_application_objc.h b/osdep/macosx_application_objc.h index 2383ba810c..6b0ca15c2e 100644 --- a/osdep/macosx_application_objc.h +++ b/osdep/macosx_application_objc.h @@ -26,6 +26,7 @@ @property(nonatomic, retain) NSMutableDictionary *menuItems; @property(nonatomic, retain) NSArray *files; +@property(nonatomic, assign) size_t openCount; @end Application *mpv_shared_app(void); -- cgit v1.2.3