From 614ff883bc8166a1c0e22c993c93895c204160ea Mon Sep 17 00:00:00 2001 From: Alexander Preisinger Date: Wed, 20 Aug 2014 17:16:18 +0200 Subject: wayland: replace deprecated xkbcommon functions Available and stable since forever (xkbcommon 0.2). --- video/out/wayland_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c index 4af9f46929..e560faccd2 100644 --- a/video/out/wayland_common.c +++ b/video/out/wayland_common.c @@ -262,7 +262,7 @@ static void keyboard_handle_keymap(void *data, wl->input.xkb.state = xkb_state_new(wl->input.xkb.keymap); if (!wl->input.xkb.state) { MP_ERR(wl, "failed to create XKB state\n"); - xkb_map_unref(wl->input.xkb.keymap); + xkb_keymap_unref(wl->input.xkb.keymap); wl->input.xkb.keymap = NULL; return; } @@ -298,7 +298,7 @@ static void keyboard_handle_key(void *data, xkb_keysym_t sym; code = key + 8; - num_syms = xkb_key_get_syms(wl->input.xkb.state, code, &syms); + num_syms = xkb_state_key_get_syms(wl->input.xkb.state, code, &syms); sym = XKB_KEY_NoSymbol; if (num_syms == 1) @@ -897,7 +897,7 @@ static void destroy_input (struct vo_wayland_state *wl) { if (wl->input.keyboard) { wl_keyboard_destroy(wl->input.keyboard); - xkb_map_unref(wl->input.xkb.keymap); + xkb_keymap_unref(wl->input.xkb.keymap); xkb_state_unref(wl->input.xkb.state); } -- cgit v1.2.3