vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Oct 17 16:45:30 2010 +0300| [7c8209d9348beb02c4c766d15a5278c19b959e03] | committer: Rémi Denis-Courmont
Revert "XCB: reset the X11 screen saver when displaying a picture" This reverts commit 48be35499d7545a31a160c7578ffa073f761e814. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7c8209d9348beb02c4c766d15a5278c19b959e03 --- modules/video_output/xcb/glx.c | 3 --- modules/video_output/xcb/x11.c | 2 -- modules/video_output/xcb/xvideo.c | 2 -- 3 files changed, 0 insertions(+), 7 deletions(-) diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c index 42ff5cf..6aa8976 100644 --- a/modules/video_output/xcb/glx.c +++ b/modules/video_output/xcb/glx.c @@ -466,11 +466,8 @@ static void PictureRender (vout_display_t *vd, picture_t *pic) static void PictureDisplay (vout_display_t *vd, picture_t *pic) { vout_display_sys_t *sys = vd->sys; - xcb_connection_t *conn = XGetXCBConnection (sys->display); - xcb_force_screen_saver (conn, XCB_SCREEN_SAVER_RESET); vout_display_opengl_Display (&sys->vgl, &vd->source); - xcb_flush (conn); picture_Release (pic); } diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c index 51963dd..ef9ba5e 100644 --- a/modules/video_output/xcb/x11.c +++ b/modules/video_output/xcb/x11.c @@ -433,8 +433,6 @@ static void Display (vout_display_t *vd, picture_t *pic) if (!p_sys->visible) goto out; - xcb_force_screen_saver (p_sys->conn, XCB_SCREEN_SAVER_RESET); - if (segment != 0) ck = xcb_shm_put_image_checked (p_sys->conn, p_sys->window, p_sys->gc, /* real width */ pic->p->i_pitch / pic->p->i_pixel_pitch, diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c index 99f1f26..f303f31 100644 --- a/modules/video_output/xcb/xvideo.c +++ b/modules/video_output/xcb/xvideo.c @@ -691,8 +691,6 @@ static void Display (vout_display_t *vd, picture_t *pic) if (!p_sys->visible) goto out; - xcb_force_screen_saver (p_sys->conn, XCB_SCREEN_SAVER_RESET); - if (segment) ck = xcb_xv_shm_put_image_checked (p_sys->conn, p_sys->port, p_sys->window, p_sys->gc, segment, p_sys->id, 0, _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
