From d084f72a6cf47b9c232243398fced85c4c620ff6 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 4 Jul 2013 17:53:30 +0200
Subject: core: remove mp_fifo leftovers

---
 core/mp_fifo.h           | 40 ----------------------------------------
 video/out/cocoa_common.m |  1 -
 video/out/vo.c           |  1 -
 video/out/vo.h           |  1 -
 4 files changed, 43 deletions(-)
 delete mode 100644 core/mp_fifo.h

diff --git a/core/mp_fifo.h b/core/mp_fifo.h
deleted file mode 100644
index 91a481a5b6..0000000000
--- a/core/mp_fifo.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPLAYER_MP_FIFO_H
-#define MPLAYER_MP_FIFO_H
-
-#include "core/bstr.h"
-#include "core/input/input.h"
-
-struct mp_fifo;
-struct input_ctx;
-
-// New code should use the wrapped functions directly.
-
-static inline void mplayer_put_key(struct mp_fifo *fifo, int code)
-{
-    mp_input_put_key((struct input_ctx *)fifo, code);
-}
-
-static inline void mplayer_put_key_utf8(struct mp_fifo *fifo, int mods, struct bstr t)
-{
-    mp_input_put_key_utf8((struct input_ctx *)fifo, mods, t);
-}
-
-#endif /* MPLAYER_MP_FIFO_H */
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index dd166e03e1..dc95e537a1 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -31,7 +31,6 @@
 #include "vo.h"
 #include "aspect.h"
 
-#include "core/mp_fifo.h"
 #include "talloc.h"
 
 #include "core/mp_msg.h"
diff --git a/video/out/vo.c b/video/out/vo.c
index 44e963984c..e05b1ae8a6 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -292,7 +292,6 @@ struct vo *init_best_video_out(struct mp_vo_opts *opts,
     struct vo *vo = talloc_ptrtype(NULL, vo);
     struct vo initial_values = {
         .opts = opts,
-        .key_fifo = (struct mp_fifo *)input_ctx,
         .encode_lavc_ctx = encode_lavc_ctx,
         .input_ctx = input_ctx,
         .event_fd = -1,
diff --git a/video/out/vo.h b/video/out/vo.h
index 611f7ec6f3..3eb9f940ea 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -262,7 +262,6 @@ struct vo {
     struct vo_w32_state *w32;
     struct vo_cocoa_state *cocoa;
     struct vo_wayland_state *wayland;
-    struct mp_fifo *key_fifo;
     struct encode_lavc_context *encode_lavc_ctx;
     struct input_ctx *input_ctx;
     int event_fd;  // check_events() should be called when this has input
-- 
cgit v1.2.3