[vlc-commits] commit: Revert "XCB: reset the X11 screen saver when displaying a picture" ( Rémi Denis-Courmont )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Oct 17 16:46:07 2010 +0300| [5398b9706b3015b538fda8b9e5f31a85d21543cc] | committer: Rémi Denis-Courmont 

Revert "XCB: reset the X11 screen saver when displaying a picture"

This reverts commit 6cd86bc29ae431131543f659ae83b7a760c7455a.

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

 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 43e7227..46f8a90 100644
--- a/modules/video_output/xcb/glx.c
+++ b/modules/video_output/xcb/glx.c
@@ -468,11 +468,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 3642c7c..8ec9232 100644
--- a/modules/video_output/xcb/x11.c
+++ b/modules/video_output/xcb/x11.c
@@ -430,8 +430,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 e7386e6..5582427 100644
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -675,8 +675,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,