diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2014-10-09 21:02:47 +0200 |
|---|---|---|
| committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2014-10-09 22:14:41 +0200 |
| commit | ca353fcf9268fc4630143db21bd1b3e7c806b889 (patch) | |
| tree | 63a839db8bf7324881eabb7d721cebdf23971082 /player/main.c | |
| parent | d1e8bb0f9be24106a15debf133ba5778dcb59056 (diff) | |
| download | mpv-ca353fcf9268fc4630143db21bd1b3e7c806b889.tar.bz2 mpv-ca353fcf9268fc4630143db21bd1b3e7c806b889.tar.xz | |
libmpv/cocoa: make global events work and get rid of is_cplayer
After @frau's split of macosx_events from macosx_application, `is_cplayer' is
not needed anymore. At the moment only global events such as Media Keys and
Apple Remote work, because the VO-level ones were hardcoded to be disabled.
(that will be fix in a later commit ).
Diffstat (limited to 'player/main.c')
| -rw-r--r-- | player/main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/player/main.c b/player/main.c index bf14b25340..906e6d34bf 100644 --- a/player/main.c +++ b/player/main.c @@ -72,6 +72,8 @@ #if HAVE_COCOA_APPLICATION #include "osdep/macosx_application.h" +#endif +#if HAVE_COCOA #include "osdep/macosx_events.h" #endif @@ -418,9 +420,8 @@ int mp_initialize(struct MPContext *mpctx) mp_get_resume_defaults(mpctx); -#if HAVE_COCOA_APPLICATION - if (mpctx->is_cplayer) - cocoa_set_input_context(mpctx->input); +#if HAVE_COCOA + cocoa_set_input_context(mpctx->input); #endif if (opts->force_vo) { @@ -465,8 +466,6 @@ int mpv_main(int argc, char *argv[]) struct MPContext *mpctx = mp_create(); struct MPOpts *opts = mpctx->opts; - mpctx->is_cplayer = true; - char *verbose_env = getenv("MPV_VERBOSE"); if (verbose_env) opts->verbose = atoi(verbose_env); |