summaryrefslogtreecommitdiffstats
path: root/osdep
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2014-12-05 22:58:02 +0100
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2014-12-05 23:13:21 +0100
commited76d22b22084ad1bb3ba033ca7cca6f6b50a5a5 (patch)
treec11aafe5a4a752f3e26e202877fa84c9ef1577f2 /osdep
parent4ced724ffd081456906747207e9c48583b0c40b7 (diff)
downloadmpv-ed76d22b22084ad1bb3ba033ca7cca6f6b50a5a5.tar.bz2
mpv-ed76d22b22084ad1bb3ba033ca7cca6f6b50a5a5.tar.xz
cocoa: don't create Dock icon for audio only files
fixes #635
Diffstat (limited to 'osdep')
-rw-r--r--osdep/macosx_application.m21
1 files changed, 4 insertions, 17 deletions
diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m
index b4631f9ea9..9efeeb274d 100644
--- a/osdep/macosx_application.m
+++ b/osdep/macosx_application.m
@@ -331,7 +331,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
@@ -441,21 +444,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();
@@ -477,7 +465,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];