summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Preisinger <alexander.preisinger@gmail.com>2013-05-02 20:14:44 +0200
committerAlexander Preisinger <alexander.preisinger@gmail.com>2013-05-02 21:01:19 +0200
commit57e0a847156f0bc7e16b30093b915525451200ff (patch)
tree483a275b27e0cb2f7df9ef71653aef8e2e72c971
parentc0b8c35e3ba858ef8e5e47ebc45ccaa88ef86348 (diff)
downloadmpv-57e0a847156f0bc7e16b30093b915525451200ff.tar.bz2
mpv-57e0a847156f0bc7e16b30093b915525451200ff.tar.xz
wayland: remove unused stuff
-rw-r--r--video/out/wayland_common.c12
-rw-r--r--video/out/wayland_common.h5
2 files changed, 0 insertions, 17 deletions
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index 0bcd9395be..cff4eb6a63 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -55,8 +55,6 @@
#define MOD_ALT_MASK 0x02
#define MOD_CONTROL_MASK 0x04
-#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
-
static int lookupkey(int key);
static void hide_cursor(struct vo_wayland_state * wl);
@@ -250,13 +248,6 @@ static void keyboard_handle_keymap(void *data,
input->xkb.keymap = NULL;
return;
}
-
- input->xkb.control_mask =
- 1 << xkb_map_mod_get_index(input->xkb.keymap, "Control");
- input->xkb.alt_mask =
- 1 << xkb_map_mod_get_index(input->xkb.keymap, "Mod1");
- input->xkb.shift_mask =
- 1 << xkb_map_mod_get_index(input->xkb.keymap, "Shift");
}
static void keyboard_handle_enter(void *data,
@@ -645,9 +636,6 @@ static void create_window (struct vo_wayland_state *wl)
static void destroy_window (struct vo_wayland_state *wl)
{
- if (wl->window->callback)
- wl_callback_destroy(wl->window->callback);
-
wl_shell_surface_destroy(wl->window->shell_surface);
wl_surface_destroy(wl->window->surface);
}
diff --git a/video/out/wayland_common.h b/video/out/wayland_common.h
index a9f3975672..9c03dca7e5 100644
--- a/video/out/wayland_common.h
+++ b/video/out/wayland_common.h
@@ -88,8 +88,6 @@ struct vo_wayland_window {
struct wl_surface *surface;
struct wl_shell_surface *shell_surface;
- struct wl_buffer *buffer;
- struct wl_callback *callback;
int events; /* mplayer events */
@@ -105,9 +103,6 @@ struct vo_wayland_input {
struct xkb_context *context;
struct xkb_keymap *keymap;
struct xkb_state *state;
- xkb_mod_mask_t shift_mask;
- xkb_mod_mask_t control_mask;
- xkb_mod_mask_t alt_mask;
} xkb;
};