summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorAlexander Preisinger <alexander.preisinger@gmail.com>2013-07-02 18:56:50 +0200
committerAlexander Preisinger <alexander.preisinger@gmail.com>2013-07-02 18:56:50 +0200
commit8ea39d548b09061adaabd0bab73f0770f41b69ec (patch)
tree3f4828307135d64bc8ff9a3e9f22b12a3006f6c1 /video
parent37c586770343a8c7806f757f21b524772b8d8a24 (diff)
downloadmpv-8ea39d548b09061adaabd0bab73f0770f41b69ec.tar.bz2
mpv-8ea39d548b09061adaabd0bab73f0770f41b69ec.tar.xz
wayland: remove mp_fifo
Diffstat (limited to 'video')
-rw-r--r--video/out/wayland_common.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index 3ff3c0ffa5..9fea1d9a12 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -276,9 +276,9 @@ static void keyboard_handle_key(void *data,
if (sym != XKB_KEY_NoSymbol && (mpkey = lookupkey(sym))) {
if (state == WL_KEYBOARD_KEY_STATE_PRESSED)
- mplayer_put_key(wl->vo->key_fifo, mpkey | MP_KEY_STATE_DOWN);
+ mp_input_put_key(wl->vo->input_ctx, mpkey | MP_KEY_STATE_DOWN);
else
- mplayer_put_key(wl->vo->key_fifo, mpkey | MP_KEY_STATE_UP);
+ mp_input_put_key(wl->vo->input_ctx, mpkey | MP_KEY_STATE_UP);
}
}
@@ -320,7 +320,7 @@ static void pointer_handle_enter(void *data,
/* Release the left button on pointer enter again
* because after moving the shell surface no release event is sent */
- mplayer_put_key(wl->vo->key_fifo, MP_MOUSE_BTN0 | MP_KEY_STATE_UP);
+ mp_input_put_key(wl->vo->input_ctx, MP_MOUSE_BTN0 | MP_KEY_STATE_UP);
show_cursor(wl);
}
@@ -330,7 +330,7 @@ static void pointer_handle_leave(void *data,
struct wl_surface *surface)
{
struct vo_wayland_state *wl = data;
- mplayer_put_key(wl->vo->key_fifo, MP_KEY_MOUSE_LEAVE);
+ mp_input_put_key(wl->vo->input_ctx, MP_KEY_MOUSE_LEAVE);
}
static void pointer_handle_motion(void *data,
@@ -356,7 +356,7 @@ static void pointer_handle_button(void *data,
{
struct vo_wayland_state *wl = data;
- mplayer_put_key(wl->vo->key_fifo, MP_MOUSE_BTN0 + (button - BTN_LEFT) |
+ mp_input_put_key(wl->vo->input_ctx, MP_MOUSE_BTN0 + (button - BTN_LEFT) |
((state == WL_POINTER_BUTTON_STATE_PRESSED)
? MP_KEY_STATE_DOWN : MP_KEY_STATE_UP));
@@ -374,9 +374,9 @@ static void pointer_handle_axis(void *data,
if (axis == WL_POINTER_AXIS_VERTICAL_SCROLL) {
if (value > 0)
- mplayer_put_key(wl->vo->key_fifo, MP_MOUSE_BTN4);
+ mp_input_put_key(wl->vo->input_ctx, MP_MOUSE_BTN4);
if (value < 0)
- mplayer_put_key(wl->vo->key_fifo, MP_MOUSE_BTN3);
+ mp_input_put_key(wl->vo->input_ctx, MP_MOUSE_BTN3);
}
}