[Mplayer-cvslog] CVS: main/libvo vo_gl.c, 1.44, 1.45 vo_gl2.c, 1.50, 1.51 vo_x11.c, 1.138, 1.139 vo_xmga.c, 1.87, 1.88 vo_xover.c, 1.7, 1.8 vo_xv.c, 1.152, 1.153 vo_xvidix.c, 1.67, 1.68 vo_xvmc.c, 1.9, 1.10

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv21192

Modified Files:
	vo_gl.c vo_gl2.c vo_x11.c vo_xmga.c vo_xover.c vo_xv.c 
	vo_xvidix.c vo_xvmc.c 
Log Message:
removed saver_on, saver_off calls, they are already in x11_common.c


Index: vo_gl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- vo_gl.c	17 Jul 2004 14:32:22 -0000	1.44
+++ vo_gl.c	25 Jul 2004 12:49:01 -0000	1.45
@@ -267,8 +267,6 @@
 
 //  printf("OpenGL setup OK!\n");
 
-      saver_off(mDisplay);  // turning off screen saver
-
       if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
 
 	return 0;
@@ -354,7 +352,6 @@
 uninit(void)
 {
   if ( !vo_config_count ) return;
-  saver_on(mDisplay); // screen saver back on
   vo_x11_uninit();
 }
 

Index: vo_gl2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- vo_gl2.c	22 Jul 2004 19:07:13 -0000	1.50
+++ vo_gl2.c	25 Jul 2004 12:49:01 -0000	1.51
@@ -1024,7 +1024,6 @@
   if (initGl(d_width, d_height) == -1)
       return -1;
 #ifndef GL_WIN32
-      saver_off(mDisplay);
       if (vo_ontop) vo_x11_setlayer(mDisplay,vo_window, vo_ontop);
 #endif
 

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- vo_x11.c	14 Jun 2004 04:53:02 -0000	1.138
+++ vo_x11.c	25 Jul 2004 12:49:01 -0000	1.139
@@ -535,8 +535,6 @@
     }
 #endif
 
-    saver_off(mDisplay);
-
     if (vo_ontop)
         vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
 
@@ -724,7 +722,6 @@
         return;
 
     freeMyXImage();
-    saver_on(mDisplay);         // screen saver back on
 
 #ifdef HAVE_XF86VM
     vo_vm_close(mDisplay);

Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- vo_xmga.c	14 Jun 2004 04:53:03 -0000	1.87
+++ vo_xmga.c	25 Jul 2004 12:49:01 -0000	1.88
@@ -272,8 +272,6 @@
 
     set_window();               // set up mga_vid_config.dest_width etc
 
-    saver_off(mDisplay);
-
     if (vo_ontop)
         vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
 
@@ -292,6 +290,5 @@
     if (!inited)
         return;                 // no window?
     inited = 0;
-    saver_on(mDisplay);
     vo_x11_uninit();            // destroy the window
 }

Index: vo_xover.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xover.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vo_xover.c	9 Jul 2004 15:29:40 -0000	1.7
+++ vo_xover.c	25 Jul 2004 12:49:01 -0000	1.8
@@ -352,8 +352,6 @@
 
   panscan_calc();
 
-  saver_off(mDisplay); /* turning off screen saver */
-
   return(0);
 }
 
@@ -404,7 +402,6 @@
   if(!vo_config_count) return;
   if(sub_vo) sub_vo->uninit();
   sub_vo = NULL;
-  saver_on(mDisplay); /* screen saver back on */
   vo_x11_uninit();
   // Restore our callbacks
   video_out_xover.draw_frame = draw_frame;

Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- vo_xv.c	14 Jun 2004 04:53:03 -0000	1.152
+++ vo_xv.c	25 Jul 2004 12:49:01 -0000	1.153
@@ -448,8 +448,6 @@
     mp_msg(MSGT_VO, MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n", drwX,
            drwY, vo_dwidth, vo_dheight);
 
-    saver_off(mDisplay);        // turning off screen saver
-
     if (vo_ontop)
         vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
 
@@ -765,7 +763,6 @@
         return;
     XvFreeAdaptorInfo(ai);
     ai = NULL;
-    saver_on(mDisplay);         // screen saver back on
     for (i = 0; i < num_buffers; i++)
         deallocate_xvimage(i);
 #ifdef HAVE_XF86VM

Index: vo_xvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- vo_xvidix.c	14 Jun 2004 04:53:03 -0000	1.67
+++ vo_xvidix.c	25 Jul 2004 12:49:01 -0000	1.68
@@ -419,8 +419,6 @@
     if (vo_ontop)
         vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
 
-    saver_off(mDisplay);        /* turning off screen saver */
-
     return (0);
 }
 
@@ -489,7 +487,6 @@
         vidix_name = NULL;
     }
 
-    saver_on(mDisplay);         /* screen saver back on */
     vo_x11_uninit();
 }
 

Index: vo_xvmc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvmc.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vo_xvmc.c	30 Nov 2003 16:36:10 -0000	1.9
+++ vo_xvmc.c	25 Jul 2004 12:49:01 -0000	1.10
@@ -794,7 +794,6 @@
 
    if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
 
-   saver_off(mDisplay);  // turning off screen saver
 //end vo_xv
 
    /* store image dimesions for displaying */
@@ -1208,7 +1207,6 @@
    if( verbose > 3 ) printf("vo_xvmc: uninit called\n");
    xvmc_free();
  //from vo_xv
-   saver_on(mDisplay);
    vo_vm_close(mDisplay);
    vo_x11_uninit();
 }