From 8af51bd3fe671b9e43dae16250cc2cf9379d60ef Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <stefano.pigozzi@gmail.com>
Date: Wed, 3 Jul 2013 22:19:26 +0200
Subject: [PATCH] cocoa: remove usage of mp_fifo

Update Cocoa parts to remove usage of the mp_fifo internal API to send events
to the core and use the input context directly. This is to follow commits the
work in commits 70a8079c and d603e73c.
---
 core/mplayer.c                  | 1 -
 osdep/macosx_application.h      | 2 --
 osdep/macosx_application.m      | 6 ------
 osdep/macosx_application_objc.h | 1 -
 osdep/macosx_events.m           | 4 ++--
 5 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/core/mplayer.c b/core/mplayer.c
index 01923dc041..79626fdc80 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -3857,7 +3857,6 @@ static void init_input(struct MPContext *mpctx)
 
 #ifdef CONFIG_COCOA
     cocoa_set_input_context(mpctx->input);
-    cocoa_set_key_fifo((struct mp_fifo *)mpctx->input);
 #endif
 }
 
diff --git a/osdep/macosx_application.h b/osdep/macosx_application.h
index 0334771892..f9fca4b334 100644
--- a/osdep/macosx_application.h
+++ b/osdep/macosx_application.h
@@ -20,7 +20,6 @@
 #define MPV_MACOSX_APPLICATION
 
 struct input_ctx;
-struct mp_fifo;
 
 typedef int (*mpv_main_fn)(int, char**);
 
@@ -48,7 +47,6 @@ void cocoa_stop_runloop(void);
 void cocoa_post_fake_event(void);
 
 void cocoa_set_input_context(struct input_ctx *input_context);
-void cocoa_set_key_fifo(struct mp_fifo *key_fifo);
 
 void macosx_finder_args_preinit(int *argc, char ***argv);
 
diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m
index f3fb5db3a5..a2718b1bf9 100644
--- a/osdep/macosx_application.m
+++ b/osdep/macosx_application.m
@@ -114,7 +114,6 @@ static NSString *escape_loadfile_name(NSString *input)
 @synthesize willStopOnOpenEvent = _will_stop_on_open_event;
 
 @synthesize inputContext = _input_context;
-@synthesize keyFIFO = _key_fifo;
 @synthesize iqueue = _iqueue;
 @synthesize eventsResponder = _events_responder;
 @synthesize menuItems = _menu_items;
@@ -391,11 +390,6 @@ void cocoa_set_input_context(struct input_ctx *input_context)
     mpv_shared_app().inputContext = input_context;
 }
 
-void cocoa_set_key_fifo(struct mp_fifo *key_fifo)
-{
-    mpv_shared_app().keyFIFO = key_fifo;
-}
-
 void cocoa_post_fake_event(void)
 {
     NSEvent* event = [NSEvent otherEventWithType:NSApplicationDefined
diff --git a/osdep/macosx_application_objc.h b/osdep/macosx_application_objc.h
index 27c1871dc4..cfb3a072b7 100644
--- a/osdep/macosx_application_objc.h
+++ b/osdep/macosx_application_objc.h
@@ -43,7 +43,6 @@ struct cocoa_input_queue;
 - (void)stopPlayback;
 
 @property(nonatomic, assign) struct input_ctx *inputContext;
-@property(nonatomic, assign) struct mp_fifo *keyFIFO;
 @property(nonatomic, retain) InputQueue *iqueue;
 @property(nonatomic, retain) EventsResponder *eventsResponder;
 @property(nonatomic, retain) NSMutableDictionary *menuItems;
diff --git a/osdep/macosx_events.m b/osdep/macosx_events.m
index 9a27f7049b..09578b0dc7 100644
--- a/osdep/macosx_events.m
+++ b/osdep/macosx_events.m
@@ -27,7 +27,6 @@
 
 #include "talloc.h"
 #include "core/input/input.h"
-#include "core/mp_fifo.h"
 // doesn't make much sense, but needed to access keymap functionality
 #include "video/out/vo.h"
 
@@ -167,7 +166,7 @@ void cocoa_check_events(void)
     Application *app = mpv_shared_app();
     int key;
     while ((key = [app.iqueue pop]) >= 0)
-        mplayer_put_key(app.keyFIFO, key);
+        mp_input_put_key(app.inputContext, key);
 }
 
 void cocoa_put_key(int keycode)
@@ -179,6 +178,7 @@ void cocoa_put_key(int keycode)
     CFMachPortRef _mk_tap_port;
     HIDRemote *_remote;
 }
+
 - (void)startAppleRemote
 {
     dispatch_async(dispatch_get_main_queue(), ^{