From d4bdd0473d6f43132257c9fb3848d829755167a3 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 5 Nov 2012 17:02:04 +0100
Subject: Rename directories, move files (step 1 of 2) (does not compile)

Tis drops the silly lib prefixes, and attempts to organize the tree in
a more logical way. Make the top-level directory less cluttered as
well.

Renames the following directories:
    libaf -> audio/filter
    libao2 -> audio/out
    libvo -> video/out
    libmpdemux -> demux

Split libmpcodecs:
    vf* -> video/filter
    vd*, dec_video.* -> video/decode
    mp_image*, img_format*, ... -> video/
    ad*, dec_audio.* -> audio/decode

libaf/format.* is moved to audio/ - this is similar to how mp_image.*
is located in video/.

Move most top-level .c/.h files to core. (talloc.c/.h is left on top-
level, because it's external.) Park some of the more annoying files
in compat/. Some of these are relicts from the time mplayer used
ffmpeg internals.

sub/ is not split, because it's too much of a mess (subtitle code is
mixed with OSD display and rendering).

Maybe the organization of core is not ideal: it mixes playback core
(like mplayer.c) and utility helpers (like bstr.c/h). Should the need
arise, the playback core will be moved somewhere else, while core
contains all helper and common code.
---
 core/mp_fifo.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 core/mp_fifo.c

(limited to 'core/mp_fifo.c')

diff --git a/core/mp_fifo.c b/core/mp_fifo.c
new file mode 100644
index 0000000000..701b7a0bc3
--- /dev/null
+++ b/core/mp_fifo.c
@@ -0,0 +1,79 @@
+/*
+ * 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.
+ */
+
+#include <stdlib.h>
+#include <assert.h>
+#include <stdbool.h>
+#include "osdep/timer.h"
+#include "input/input.h"
+#include "input/keycodes.h"
+#include "mp_fifo.h"
+#include "talloc.h"
+#include "options.h"
+
+
+struct mp_fifo {
+    struct MPOpts *opts;
+    struct input_ctx *input;
+    int last_key_down;
+    unsigned last_down_time;
+};
+
+struct mp_fifo *mp_fifo_create(struct input_ctx *input, struct MPOpts *opts)
+{
+    struct mp_fifo *fifo = talloc_zero(NULL, struct mp_fifo);
+    fifo->input = input;
+    fifo->opts = opts;
+    return fifo;
+}
+
+static void put_double(struct mp_fifo *fifo, int code)
+{
+  if (code >= MOUSE_BTN0 && code < MOUSE_BTN_END)
+      mp_input_feed_key(fifo->input, code - MOUSE_BTN0 + MOUSE_BTN0_DBL);
+}
+
+void mplayer_put_key(struct mp_fifo *fifo, int code)
+{
+    unsigned now = GetTimerMS();
+    int doubleclick_time = fifo->opts->doubleclick_time;
+    // ignore system-doubleclick if we generate these events ourselves
+    if (doubleclick_time
+        && (code & ~MP_KEY_DOWN) >= MOUSE_BTN0_DBL
+        && (code & ~MP_KEY_DOWN) < MOUSE_BTN_DBL_END)
+        return;
+    mp_input_feed_key(fifo->input, code);
+    if (code & MP_KEY_DOWN) {
+        code &= ~MP_KEY_DOWN;
+        if (fifo->last_key_down == code
+            && now - fifo->last_down_time < doubleclick_time)
+            put_double(fifo, code);
+        fifo->last_key_down = code;
+        fifo->last_down_time = now;
+    }
+}
+
+void mplayer_put_key_utf8(struct mp_fifo *fifo, int mods, struct bstr t)
+{
+    while (t.len) {
+        int code = bstr_decode_utf8(t, &t);
+        if (code < 0)
+            break;
+        mplayer_put_key(fifo, code | mods);
+    }
+}
-- 
cgit v1.2.3