From d603e73c24d6d7ad08a54c10d16c83d93b01a007 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 2 Jul 2013 14:04:36 +0200
Subject: core: cleanup more mp_fifo leftovers

Now only the OSX and Wayland parts are using this.
---
 osdep/getch2-win.c | 5 ++---
 osdep/getch2.c     | 5 ++---
 osdep/getch2.h     | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'osdep')

diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c
index 2edb537076..3cafcbeb7e 100644
--- a/osdep/getch2-win.c
+++ b/osdep/getch2-win.c
@@ -30,7 +30,6 @@
 #include <windows.h>
 #include "core/input/keycodes.h"
 #include "core/input/input.h"
-#include "core/mp_fifo.h"
 #include "getch2.h"
 
 int mp_input_slave_cmd_func(int fd,char* dest,int size){
@@ -158,11 +157,11 @@ static int getch2_internal(void)
 	return -1;
 }
 
-bool getch2(struct mp_fifo *fifo)
+bool getch2(struct input_ctx *ctx)
 {
     int r = getch2_internal();
     if (r >= 0)
-	mplayer_put_key(fifo, r);
+	mp_input_put_key(ctx, r);
     return true;
 }
 
diff --git a/osdep/getch2.c b/osdep/getch2.c
index ae6a04f389..0e58b53a4d 100644
--- a/osdep/getch2.c
+++ b/osdep/getch2.c
@@ -54,7 +54,6 @@
 #include <fcntl.h>
 
 #include "core/bstr.h"
-#include "core/mp_fifo.h"
 #include "core/input/input.h"
 #include "core/input/keycodes.h"
 #include "getch2.h"
@@ -156,7 +155,7 @@ void get_screen_size(void){
 #endif
 }
 
-bool getch2(struct mp_fifo *fifo)
+bool getch2(struct input_ctx *input_ctx)
 {
     int retval = read(0, &getch2_buf[getch2_len], BUF_LEN-getch2_len);
     /* Return false on EOF to stop running select() on the FD, as it'd
@@ -281,7 +280,7 @@ bool getch2(struct mp_fifo *fifo)
         getch2_len -= len;
         for (i = 0; i < getch2_len; i++)
             getch2_buf[i] = getch2_buf[len+i];
-        mplayer_put_key(fifo, code);
+        mp_input_put_key(input_ctx, code);
     }
     return true;
 }
diff --git a/osdep/getch2.h b/osdep/getch2.h
index 5a04c4228e..4dc3b29dce 100644
--- a/osdep/getch2.h
+++ b/osdep/getch2.h
@@ -49,8 +49,8 @@ void getch2_disable(void);
 void getch2_poll(void);
 
 /* Read a character or a special key code (see keycodes.h) */
-struct mp_fifo;
-bool getch2(struct mp_fifo *fifo);
+struct input_ctx;
+bool getch2(struct input_ctx *ictx);
 
 #if defined(__MINGW32__)
 // slave cmd function for Windows
-- 
cgit v1.2.3