summaryrefslogtreecommitdiffstats
path: root/osdep/macosx_application.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-05-02 18:47:57 +0200
committerwm4 <wm4@nowhere>2015-05-02 18:59:58 +0200
commit1e7831070f6ae1af0a1a29b0d680ef2907bf8cf6 (patch)
tree0d5bc34cfcdf029b8a22deb98c4f0e73c4266d57 /osdep/macosx_application.h
parent19a5b20752ecc7465cf17781f908e12bf4ca136d (diff)
downloadmpv-1e7831070f6ae1af0a1a29b0d680ef2907bf8cf6.tar.bz2
mpv-1e7831070f6ae1af0a1a29b0d680ef2907bf8cf6.tar.xz
build: move main-fn files to osdep
And split the Cocoa and Unix cases. Simplify the Cocoa case slightly by calling mpv_main directly, instead of passing a function pointer. Also add a comment explaining why Cocoa needs a special case at all.
Diffstat (limited to 'osdep/macosx_application.h')
-rw-r--r--osdep/macosx_application.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/osdep/macosx_application.h b/osdep/macosx_application.h
index c48d1154a0..fea34a3705 100644
--- a/osdep/macosx_application.h
+++ b/osdep/macosx_application.h
@@ -18,8 +18,6 @@
#ifndef MPV_MACOSX_APPLICATION
#define MPV_MACOSX_APPLICATION
-typedef int (*mpv_main_fn)(int, char**);
-
// Menu Keys identifing menu items
typedef enum {
MPM_H_SIZE,
@@ -30,7 +28,7 @@ typedef enum {
} MPMenuKey;
// multithreaded wrapper for mpv_main
-int cocoa_main(mpv_main_fn mpv_main, int argc, char *argv[]);
+int cocoa_main(int argc, char *argv[]);
void cocoa_register_menu_item_action(MPMenuKey key, void* action);
#endif /* MPV_MACOSX_APPLICATION */