xcb: print X11 key symbol in debug

[vlc] / modules / video_output / vmem.c

diff --git a/modules/video_output/vmem.c b/modules/video_output/vmem.c
index 06ed1821354db3b6330891f1efec472a7e497bc5..ede49a4fde5e80d0b01e2838abe0440d67f34a0c 100644 (file)
--- a/modules/video_output/vmem.c
+++ b/modules/video_output/vmem.c
@@ -105,9 +105,8 @@ typedef unsigned (*vlc_format_cb)(void **, char *, unsigned *, unsigned *,
                                   unsigned *, unsigned *);
 
 static picture_pool_t *Pool  (vout_display_t *, unsigned);
-static void           Display(vout_display_t *, picture_t *);
+static void           Display(vout_display_t *, picture_t *, subpicture_t *);
 static int            Control(vout_display_t *, int, va_list);
-static void           Manage (vout_display_t *);
 
 static int            Lock(picture_t *);
 static void           Unlock(picture_t *);
@@ -221,7 +220,7 @@ static int Open(vlc_object_t *object)
     vd->prepare = NULL;
     vd->display = Display;
     vd->control = Control;
-    vd->manage  = Manage;
+    vd->manage  = NULL;
 
     /* */
     vout_display_SendEventFullscreen(vd, false);
@@ -296,7 +295,7 @@ static picture_pool_t *Pool(vout_display_t *vd, unsigned count)
     return sys->pool;
 }
 
-static void Display(vout_display_t *vd, picture_t *picture)
+static void Display(vout_display_t *vd, picture_t *picture, subpicture_t *subpicture)
 {
     vout_display_sys_t *sys = vd->sys;
 
@@ -304,6 +303,7 @@ static void Display(vout_display_t *vd, picture_t *picture)
     if (sys->display != NULL)
         sys->display(sys->opaque, picture->p_sys->id);
     picture_Release(picture);
+    VLC_UNUSED(subpicture);
 }
 
 static int Control(vout_display_t *vd, int query, va_list args)
@@ -323,10 +323,6 @@ static int Control(vout_display_t *vd, int query, va_list args)
         return VLC_EGENERIC;
     }
 }
-static void Manage(vout_display_t *vd)
-{
-    VLC_UNUSED(vd);
-}
 
 /* */
 static int Lock(picture_t *picture)