From 73121dbcc164c69ab461996c233bc5f4634312c1 Mon Sep 17 00:00:00 2001 From: Alexander Preisinger Date: Sun, 15 Jun 2014 14:46:27 +0200 Subject: wayland: move subsurfaces to wayland vo Subsurfaces are only used by the wayland vo. Thats why it makes sense to move all osd and subsurface specific parts to the vo_wayland.c Also destroy the subsurfaces and subcompositor properly. --- video/out/wayland_common.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'video/out/wayland_common.h') diff --git a/video/out/wayland_common.h b/video/out/wayland_common.h index dbfa41140f..dc446bc6f3 100644 --- a/video/out/wayland_common.h +++ b/video/out/wayland_common.h @@ -27,8 +27,6 @@ #include "config.h" -#include "sub/osd.h" - #if HAVE_GL_WAYLAND #include #include @@ -104,9 +102,6 @@ struct vo_wayland_state { int32_t mouse_y; struct wl_shell_surface *shell_surface; int events; /* mplayer events (VO_EVENT_RESIZE) */ - - struct wl_surface *osd_surfaces[MAX_OSD_PARTS]; - struct wl_subsurface *osd_subsurfaces[MAX_OSD_PARTS]; } window; struct { -- cgit v1.2.3