summaryrefslogtreecommitdiffstats
path: root/core/mplayer.c
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2013-06-03 00:52:40 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2013-06-03 22:35:47 +0200
commit72f2942dfa575a57d61fe023c845ba711ab78f55 (patch)
treed62395e98d5ee0ae58a5779bd8b472ee90aa9a80 /core/mplayer.c
parentc39efb96d1109b7a5960cd17cc4c392c2b93b61b (diff)
downloadmpv-72f2942dfa575a57d61fe023c845ba711ab78f55.tar.bz2
mpv-72f2942dfa575a57d61fe023c845ba711ab78f55.tar.xz
osx: add Apple Remote support
After killing the non functional AR support in c8fd9e5 I got much complaints so this adds AR support back in (and it works). I am using the HIDRemote class by Felix Schwarz and that part of the code is under the BSD license. I slightly modified it replacing [NSApplication sharedApplication] with NSApp. The code of the class is quite complex (probably because it had to deal with all the edge cases with IOKit) but it works nicely as a black box. In a later commit I'll remove the deprecation warnings caused by HIDRemote's usage of Gestalt. Check out `etc/input.conf` for the default bindings. Apple Remote functionality is automatically compiled in when cocoa is enabled. It can be disabled at runtime with the `--no-ar` option.
Diffstat (limited to 'core/mplayer.c')
-rw-r--r--core/mplayer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/mplayer.c b/core/mplayer.c
index 89e79ef044..b5123a3d41 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -601,7 +601,7 @@ static MP_NORETURN void exit_player(struct MPContext *mpctx,
timeEndPeriod(1);
#endif
- mp_input_uninit(mpctx->input);
+ mp_input_uninit(mpctx->input, &mpctx->opts.input);
osd_free(mpctx->osd);