vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Nov 30 18:48:34 2016 +0200| [5d4e758d18548ec357a801958dc8d28fdd67360f] | committer: Rémi Denis-Courmont
xcb/x11: remove the manage callback > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5d4e758d18548ec357a801958dc8d28fdd67360f --- modules/video_output/xcb/x11.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c index 1b7455d..81501b7 100644 --- a/modules/video_output/xcb/x11.c +++ b/modules/video_output/xcb/x11.c @@ -78,7 +78,6 @@ struct vout_display_sys_t static picture_pool_t *Pool (vout_display_t *, unsigned); static void Display (vout_display_t *, picture_t *, subpicture_t *subpicture); static int Control (vout_display_t *, int, va_list); -static void Manage (vout_display_t *); static void ResetPictures (vout_display_t *); @@ -305,7 +304,7 @@ found_format:; vd->prepare = NULL; vd->display = Display; vd->control = Control; - vd->manage = Manage; + vd->manage = NULL; return VLC_SUCCESS; @@ -404,6 +403,8 @@ static void Display (vout_display_t *vd, picture_t *pic, subpicture_t *subpictur xcb_shm_seg_t segment = XCB_picture_GetSegment(pic); xcb_void_cookie_t ck; + vlc_xcb_Manage(vd, sys->conn, &sys->visible); + if (!sys->visible) goto out; if (segment != 0) @@ -513,13 +514,6 @@ static int Control (vout_display_t *vd, int query, va_list ap) } } -static void Manage (vout_display_t *vd) -{ - vout_display_sys_t *sys = vd->sys; - - vlc_xcb_Manage(vd, sys->conn, &sys->visible); -} - static void ResetPictures (vout_display_t *vd) { vout_display_sys_t *sys = vd->sys; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
