summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/input/input.c7
-rw-r--r--core/mplayer.c1
2 files changed, 8 insertions, 0 deletions
diff --git a/core/input/input.c b/core/input/input.c
index c9958753cd..0154fa11aa 100644
--- a/core/input/input.c
+++ b/core/input/input.c
@@ -61,6 +61,10 @@
#include <lirc/lircc.h>
#endif
+#ifdef CONFIG_COCOA
+#include "osdep/macosx_events.h"
+#endif
+
#define MP_MAX_KEY_DOWN 4
struct cmd_bind {
@@ -1474,6 +1478,9 @@ static void read_all_fd_events(struct input_ctx *ictx, int time)
static void read_all_events(struct input_ctx *ictx, int time)
{
getch2_poll();
+#ifdef CONFIG_COCOA
+ cocoa_check_events();
+#endif
read_all_fd_events(ictx, time);
}
diff --git a/core/mplayer.c b/core/mplayer.c
index 52aa34058c..89e79ef044 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -3999,6 +3999,7 @@ static void init_input(struct MPContext *mpctx)
#ifdef CONFIG_COCOA
cocoa_set_input_context(mpctx->input);
+ cocoa_set_key_fifo(mpctx->key_fifo);
#endif
}