diff options
| author | wm4 <wm4@nowhere> | 2013-07-02 14:04:36 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-02 14:11:31 +0200 |
| commit | d603e73c24d6d7ad08a54c10d16c83d93b01a007 (patch) | |
| tree | 1ff7c913e0c198961f23ddcbc2e271ce9ed2fe16 /video/out/vo_caca.c | |
| parent | 70a8079c8e0109eb89db3f3278be2a75a710c95e (diff) | |
| download | mpv-d603e73c24d6d7ad08a54c10d16c83d93b01a007.tar.bz2 mpv-d603e73c24d6d7ad08a54c10d16c83d93b01a007.tar.xz | |
core: cleanup more mp_fifo leftovers
Now only the OSX and Wayland parts are using this.
Diffstat (limited to 'video/out/vo_caca.c')
| -rw-r--r-- | video/out/vo_caca.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/video/out/vo_caca.c b/video/out/vo_caca.c index 78eaf2b395..dd6d76f311 100644 --- a/video/out/vo_caca.c +++ b/video/out/vo_caca.c @@ -43,7 +43,7 @@ #include "core/input/keycodes.h" #include "core/input/input.h" #include "core/mp_msg.h" -#include "core/mp_fifo.h" +#include "core/input/input.h" /* caca stuff */ static caca_canvas_t *canvas; @@ -169,19 +169,19 @@ static void check_events(struct vo *vo) resize(); break; case CACA_EVENT_QUIT: - mplayer_put_key(vo->key_fifo, MP_KEY_CLOSE_WIN); + mp_input_put_key(vo->input_ctx, MP_KEY_CLOSE_WIN); break; case CACA_EVENT_MOUSE_MOTION: vo_mouse_movement(vo, cev.data.mouse.x, cev.data.mouse.y); break; case CACA_EVENT_MOUSE_PRESS: if (!vo->opts->nomouse_input) - mplayer_put_key(vo->key_fifo, + mp_input_put_key(vo->input_ctx, (MP_MOUSE_BTN0 + cev.data.mouse.button - 1) | MP_KEY_STATE_DOWN); break; case CACA_EVENT_MOUSE_RELEASE: if (!vo->opts->nomouse_input) - mplayer_put_key(vo->key_fifo, + mp_input_put_key(vo->input_ctx, (MP_MOUSE_BTN0 + cev.data.mouse.button - 1) | MP_KEY_STATE_UP); break; case CACA_EVENT_KEY_PRESS: @@ -191,7 +191,7 @@ static void check_events(struct vo *vo) const char *msg_name; if (mpkey) - mplayer_put_key(vo->key_fifo, mpkey); + mp_input_put_key(vo->input_ctx, mpkey); else switch (key) { case 'd': @@ -228,7 +228,7 @@ static void check_events(struct vo *vo) default: if (key <= 255) - mplayer_put_key(vo->key_fifo, key); + mp_input_put_key(vo->input_ctx, key); break; } } |