summaryrefslogtreecommitdiffstats
path: root/mp_fifo.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-05 17:02:04 +0100
committerwm4 <wm4@nowhere>2012-11-12 20:06:14 +0100
commitd4bdd0473d6f43132257c9fb3848d829755167a3 (patch)
tree8021c2f7da1841393c8c832105e20cd527826d6c /mp_fifo.c
parentbd48deba77bd5582c5829d6fe73a7d2571088aba (diff)
downloadmpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.bz2
mpv-d4bdd0473d6f43132257c9fb3848d829755167a3.tar.xz
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.
Diffstat (limited to 'mp_fifo.c')
-rw-r--r--mp_fifo.c79
1 files changed, 0 insertions, 79 deletions
diff --git a/mp_fifo.c b/mp_fifo.c
deleted file mode 100644
index 701b7a0bc3..0000000000
--- a/mp_fifo.c
+++ /dev/null
@@ -1,79 +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.
- */
-
-#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);
- }
-}