diff options
| author | wm4 <wm4@nowhere> | 2015-02-12 18:20:29 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-02-12 21:18:12 +0100 |
| commit | b8de478f51fdd9982482f8e9f3502a5e0d97f31c (patch) | |
| tree | fb3621bb2ca0718a0f8feb5fda2d592248d8d8c9 | |
| parent | e920a00ebad645cd14d341f4dabd4c5c077d2e0c (diff) | |
| download | mpv-b8de478f51fdd9982482f8e9f3502a5e0d97f31c.tar.bz2 mpv-b8de478f51fdd9982482f8e9f3502a5e0d97f31c.tar.xz | |
osx: move cocoa specific call out of common code
This is almost equivalent, and gets rid of the ifdef.
| -rw-r--r-- | osdep/macosx_application.m | 2 | ||||
| -rw-r--r-- | player/main.c | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m index fa5058fd1d..008622f3ea 100644 --- a/osdep/macosx_application.m +++ b/osdep/macosx_application.m @@ -274,6 +274,8 @@ static void *playback_thread(void *ctx_obj) @autoreleasepool { struct playback_thread_ctx *ctx = (struct playback_thread_ctx*) ctx_obj; ctx->mpv_main(*ctx->argc, *ctx->argv); + terminate_cocoa_application(); + // normally never reached cocoa_stop_runloop(); pthread_exit(NULL); } diff --git a/player/main.c b/player/main.c index b5ec21db0a..118aef9eed 100644 --- a/player/main.c +++ b/player/main.c @@ -71,9 +71,6 @@ #endif #endif -#if HAVE_COCOA_APPLICATION -#include "osdep/macosx_application.h" -#endif #if HAVE_COCOA #include "osdep/macosx_events.h" #endif @@ -227,11 +224,6 @@ static int prepare_exit_cplayer(struct MPContext *mpctx, enum exit_reason how) rc = mpctx->quit_custom_rc; mp_destroy(mpctx); - -#if HAVE_COCOA_APPLICATION - // Note: this function never returns due to Cocoa calling exit(0) - terminate_cocoa_application(); -#endif return rc; } |