diff options
author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2014-12-05 22:58:02 +0100 |
---|---|---|
committer | Alessandro Ghedini <alessandro@ghedini.me> | 2014-12-08 00:03:34 +0100 |
commit | 1e8dbf8212da1a17350a55766580ababfcffa8dd (patch) | |
tree | d57bebd74ec47592039c46c0cc7da5dea72b2241 /osdep | |
parent | 1bfaab13ca9a25224ddb85f8714cbfb7b4bce7fd (diff) | |
download | mpv-1e8dbf8212da1a17350a55766580ababfcffa8dd.tar.bz2 mpv-1e8dbf8212da1a17350a55766580ababfcffa8dd.tar.xz |
cocoa: don't create Dock icon for audio only files
fixes #635
Diffstat (limited to 'osdep')
-rw-r--r-- | osdep/macosx_application.m | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m index 37c3d40773..3fa6da1f03 100644 --- a/osdep/macosx_application.m +++ b/osdep/macosx_application.m @@ -329,7 +329,10 @@ void init_cocoa_application(void) NSApp = mpv_shared_app(); [NSApp setDelegate:NSApp]; [NSApp initialize_menu]; - [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular]; + + // Will be set to Regular from cocoa_common during UI creation so that we + // don't create an icon when playing audio only files. + [NSApp setActivationPolicy:NSApplicationActivationPolicyAccessory]; atexit_b(^{ // Because activation policy has just been set to behave like a real @@ -439,21 +442,6 @@ static bool bundle_started_from_finder(int argc, char **argv) } } -static const char macosx_icon[] = -#include "osdep/macosx_icon.inc" -; - -static void set_application_icon(NSApplication *app) -{ - NSData *icon_data = [NSData dataWithBytesNoCopy:(void *)macosx_icon - length:sizeof(macosx_icon) - freeWhenDone:NO]; - NSImage *icon = [[NSImage alloc] initWithData:icon_data]; - [app setApplicationIconImage:icon]; - [icon release]; - [icon_data release]; -} - void macosx_finder_args_preinit(int *argc, char ***argv) { Application *app = mpv_shared_app(); @@ -475,7 +463,6 @@ void macosx_finder_args_preinit(int *argc, char ***argv) *argc = cocoa_argc; *argv = cocoa_argv; } else { - set_application_icon(app); for (int i = 0; i < *argc; i++ ) { NSString *arg = [NSString stringWithUTF8String:(*argv)[i]]; [app.argumentsList addObject:arg]; |