[vlc-commits] vdpau: remove the manage callback

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Nov 30 18:47:57 2016 +0200| [c1ae08c2c8e713a49da64352033c122f9a0c11ff] | committer: Rémi Denis-Courmont

vdpau: remove the manage callback

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c1ae08c2c8e713a49da64352033c122f9a0c11ff
---

 modules/hw/vdpau/display.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/modules/hw/vdpau/display.c b/modules/hw/vdpau/display.c
index 7bd9851..a92ac74 100644
--- a/modules/hw/vdpau/display.c
+++ b/modules/hw/vdpau/display.c
@@ -319,6 +319,12 @@ out:
        delete at this point */
     if (subpicture)
         subpicture_Delete(subpicture);
+
+    /* Drain the event queue. TODO: remove sys->conn completely */
+    xcb_generic_event_t *ev;
+
+    while ((ev = xcb_poll_for_event(sys->conn)) != NULL)
+        free(ev);
 }
 
 static int Control(vout_display_t *vd, int query, va_list ap)
@@ -394,14 +400,6 @@ static int Control(vout_display_t *vd, int query, va_list ap)
     return VLC_SUCCESS;
 }
 
-static void Manage(vout_display_t *vd)
-{
-    vout_display_sys_t *sys = vd->sys;
-    bool visible;
-
-    vlc_xcb_Manage(vd, sys->conn, &visible);
-}
-
 static int xcb_screen_num(xcb_connection_t *conn, const xcb_screen_t *screen)
 {
     const xcb_setup_t *setup = xcb_get_setup(conn);
@@ -657,7 +655,7 @@ static int Open(vlc_object_t *obj)
     vd->prepare = Queue;
     vd->display = Wait;
     vd->control = Control;
-    vd->manage = Manage;
+    vd->manage = NULL;
 
     return VLC_SUCCESS;