[vlc-commits] xcb: drop dead code

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Jan 15 19:37:12 2019 +0200| [8f7271ed9be50e62fdacb0be9086e236398e2b03] | committer: Rémi Denis-Courmont

xcb: drop dead code

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

 modules/video_output/xcb/events.c | 24 +++---------------------
 modules/video_output/xcb/events.h |  2 +-
 modules/video_output/xcb/render.c |  3 +--
 modules/video_output/xcb/x11.c    |  3 +--
 modules/video_output/xcb/xvideo.c |  3 +--
 5 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/modules/video_output/xcb/events.c b/modules/video_output/xcb/events.c
index 19137fceca..7c036b4634 100644
--- a/modules/video_output/xcb/events.c
+++ b/modules/video_output/xcb/events.c
@@ -140,31 +140,13 @@ error:
     return NULL;
 }
 
-/* NOTE: we assume no other thread will be _setting_ our video output events
- * variables. Afterall, only this plugin is supposed to know when these occur.
-  * Otherwise, we'd var_OrInteger() and var_NandInteger() functions...
- */
-
-static void HandleVisibilityNotify (vout_display_t *vd, bool *visible,
-                                    const xcb_visibility_notify_event_t *ev)
-{
-    *visible = ev->state != XCB_VISIBILITY_FULLY_OBSCURED;
-    msg_Dbg (vd, "display is %svisible", *visible ? "" : "not ");
-}
-
 /**
  * Process an X11 event.
  */
-static int ProcessEvent (vout_display_t *vd,
-                         bool *visible, xcb_generic_event_t *ev)
+static int ProcessEvent(vout_display_t *vd, xcb_generic_event_t *ev)
 {
     switch (ev->response_type & 0x7f)
     {
-        case XCB_VISIBILITY_NOTIFY:
-            HandleVisibilityNotify (vd, visible,
-                                    (xcb_visibility_notify_event_t *)ev);
-            break;
-
         case XCB_MAPPING_NOTIFY:
             break;
 
@@ -176,12 +158,12 @@ static int ProcessEvent (vout_display_t *vd,
     return VLC_SUCCESS;
 }
 
-int vlc_xcb_Manage(vout_display_t *vd, xcb_connection_t *conn, bool *visible)
+int vlc_xcb_Manage(vout_display_t *vd, xcb_connection_t *conn)
 {
     xcb_generic_event_t *ev;
 
     while ((ev = xcb_poll_for_event (conn)) != NULL)
-        ProcessEvent (vd, visible, ev);
+        ProcessEvent(vd, ev);
 
     if (xcb_connection_has_error (conn))
     {
diff --git a/modules/video_output/xcb/events.h b/modules/video_output/xcb/events.h
index 885aa5acca..be86776847 100644
--- a/modules/video_output/xcb/events.h
+++ b/modules/video_output/xcb/events.h
@@ -47,4 +47,4 @@ struct vout_window_t *vlc_xcb_parent_Create(vout_display_t *obj,
 /**
  * Processes XCB events.
  */
-int vlc_xcb_Manage(vout_display_t *vd, xcb_connection_t *conn, bool *visible);
+int vlc_xcb_Manage(vout_display_t *vd, xcb_connection_t *conn);
diff --git a/modules/video_output/xcb/render.c b/modules/video_output/xcb/render.c
index b3d223985f..135d346d54 100644
--- a/modules/video_output/xcb/render.c
+++ b/modules/video_output/xcb/render.c
@@ -243,9 +243,8 @@ static void Display(vout_display_t *vd, picture_t *pic)
     vout_display_sys_t *sys = vd->sys;
     xcb_connection_t *conn = sys->conn;
     xcb_void_cookie_t ck;
-    bool visible_dummy;
 
-    vlc_xcb_Manage(vd, conn, &visible_dummy);
+    vlc_xcb_Manage(vd, conn);
 
     /* Copy the scaled picture into the target picture, in other words
      * copy the rendered pixmap into the window.
diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c
index 0b0604bbad..86a66f6ced 100644
--- a/modules/video_output/xcb/x11.c
+++ b/modules/video_output/xcb/x11.c
@@ -90,9 +90,8 @@ static void Display (vout_display_t *vd, picture_t *pic)
     const picture_buffer_t *buf = pic->p_sys;
     xcb_shm_seg_t segment = sys->segment;
     xcb_void_cookie_t ck;
-    bool dummy;
 
-    vlc_xcb_Manage(vd, sys->conn, &dummy);
+    vlc_xcb_Manage(vd, sys->conn);
 
     if (sys->attached)
         ck = xcb_shm_put_image_checked(conn, sys->window, sys->gc,
diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index 62dd5c1c35..0cfc511e5b 100644
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -601,9 +601,8 @@ static void Display (vout_display_t *vd, picture_t *pic)
     xcb_shm_seg_t segment = XCB_picture_GetSegment(pic);
     xcb_void_cookie_t ck;
     video_format_t fmt;
-    bool dummy;
 
-    vlc_xcb_Manage(vd, p_sys->conn, &dummy);
+    vlc_xcb_Manage(vd, p_sys->conn);
 
     video_format_ApplyRotation(&fmt, &vd->source);