summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorAlexander Preisinger <alexander.preisinger@gmail.com>2013-08-20 18:42:43 +0200
committerAlexander Preisinger <alexander.preisinger@gmail.com>2013-08-25 22:46:26 +0200
commit9af505a7965a02e3ea0468fd33b658a4f58dc9c1 (patch)
treecce154a3a814a269513d9bd6b8a53f2e455675c4 /video
parent8fd274ea3bc6b102f8931e4a2e72bca4d759d048 (diff)
downloadmpv-9af505a7965a02e3ea0468fd33b658a4f58dc9c1.tar.bz2
mpv-9af505a7965a02e3ea0468fd33b658a4f58dc9c1.tar.xz
wayland: remove shm listener for the backend
The obtained information from the shm listener isn't used by anything and is also wrong now in wayland git master branch because of new shm formats which need a different way of saving the supported formats.
Diffstat (limited to 'video')
-rw-r--r--video/out/wayland_common.c15
-rw-r--r--video/out/wayland_common.h1
2 files changed, 0 insertions, 16 deletions
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index 7f9803befc..da2787df08 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -427,19 +427,6 @@ static const struct wl_seat_listener seat_listener = {
seat_handle_capabilities,
};
-/* SHM LISTENER */
-static void shm_handle_format(void *data,
- struct wl_shm *wl_shm,
- uint32_t format)
-{
- struct vo_wayland_state *wl = data;
- wl->display.shm_formats |= (1 << format);
-}
-
-const struct wl_shm_listener shm_listener = {
- shm_handle_format
-};
-
static void registry_handle_global (void *data,
struct wl_registry *registry,
uint32_t id,
@@ -463,7 +450,6 @@ static void registry_handle_global (void *data,
else if (strcmp(interface, "wl_shm") == 0) {
wl->display.shm = wl_registry_bind(reg, id, &wl_shm_interface, 1);
- wl_shm_add_listener(wl->display.shm, &shm_listener, wl);
}
else if (strcmp(interface, "wl_output") == 0) {
@@ -699,7 +685,6 @@ static bool create_input (struct vo_wayland_state *wl)
return true;
}
-
static void destroy_input (struct vo_wayland_state *wl)
{
if (wl->input.keyboard)
diff --git a/video/out/wayland_common.h b/video/out/wayland_common.h
index 7e6f000c24..27e074f623 100644
--- a/video/out/wayland_common.h
+++ b/video/out/wayland_common.h
@@ -59,7 +59,6 @@ struct vo_wayland_state {
int display_fd;
struct wl_shm *shm;
- uint32_t shm_formats;
} display;
struct {