From 8ea39d548b09061adaabd0bab73f0770f41b69ec Mon Sep 17 00:00:00 2001 From: Alexander Preisinger Date: Tue, 2 Jul 2013 18:56:50 +0200 Subject: wayland: remove mp_fifo --- video/out/wayland_common.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'video') 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); } } -- cgit v1.2.3