diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-07-25 12:49:01 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-07-25 12:49:01 +0000 |
commit | d7d2ea1551dca050d509bbe519d74df184d24ab3 (patch) | |
tree | 83c677f885b276e62e241a8230ede5dfe077523b | |
parent | ce1d9c664cc94c1d6d8b26a7e63ef5537db8bb15 (diff) | |
download | mpv-d7d2ea1551dca050d509bbe519d74df184d24ab3.tar.bz2 mpv-d7d2ea1551dca050d509bbe519d74df184d24ab3.tar.xz |
removed saver_on, saver_off calls, they are already in x11_common.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12896 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | libvo/vo_gl.c | 3 | ||||
-rw-r--r-- | libvo/vo_gl2.c | 1 | ||||
-rw-r--r-- | libvo/vo_x11.c | 3 | ||||
-rw-r--r-- | libvo/vo_xmga.c | 3 | ||||
-rw-r--r-- | libvo/vo_xover.c | 3 | ||||
-rw-r--r-- | libvo/vo_xv.c | 3 | ||||
-rw-r--r-- | libvo/vo_xvidix.c | 3 | ||||
-rw-r--r-- | libvo/vo_xvmc.c | 2 |
8 files changed, 0 insertions, 21 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index e4460b1fbc..6606260817 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -267,8 +267,6 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin // 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 @@ static void uninit(void) { if ( !vo_config_count ) return; - saver_on(mDisplay); // screen saver back on vo_x11_uninit(); } diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index 7d9849b6d8..b116a5425a 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -1024,7 +1024,6 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin 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 diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index adc17f5ce2..07f4431934 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -535,8 +535,6 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, } #endif - saver_off(mDisplay); - if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop); @@ -724,7 +722,6 @@ static void uninit(void) return; freeMyXImage(); - saver_on(mDisplay); // screen saver back on #ifdef HAVE_XF86VM vo_vm_close(mDisplay); diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c index 2a9ebe47a4..f5d4f1ef77 100644 --- a/libvo/vo_xmga.c +++ b/libvo/vo_xmga.c @@ -272,8 +272,6 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, 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 @@ static void uninit(void) if (!inited) return; // no window? inited = 0; - saver_on(mDisplay); vo_x11_uninit(); // destroy the window } diff --git a/libvo/vo_xover.c b/libvo/vo_xover.c index 4497f7ecdb..7ed6ccb614 100644 --- a/libvo/vo_xover.c +++ b/libvo/vo_xover.c @@ -352,8 +352,6 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, panscan_calc(); - saver_off(mDisplay); /* turning off screen saver */ - return(0); } @@ -404,7 +402,6 @@ static void uninit(void) 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; diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index f461953d0a..540003b67a 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -448,8 +448,6 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, 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 @@ static void uninit(void) 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 diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c index ae4294671f..786cacd6b9 100644 --- a/libvo/vo_xvidix.c +++ b/libvo/vo_xvidix.c @@ -419,8 +419,6 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop); - saver_off(mDisplay); /* turning off screen saver */ - return (0); } @@ -489,7 +487,6 @@ static void uninit(void) vidix_name = NULL; } - saver_on(mDisplay); /* screen saver back on */ vo_x11_uninit(); } diff --git a/libvo/vo_xvmc.c b/libvo/vo_xvmc.c index 31fe54f09f..3a620ce8b6 100644 --- a/libvo/vo_xvmc.c +++ b/libvo/vo_xvmc.c @@ -794,7 +794,6 @@ found_subpic: 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 @@ static void uninit(void){ if( verbose > 3 ) printf("vo_xvmc: uninit called\n"); xvmc_free(); //from vo_xv - saver_on(mDisplay); vo_vm_close(mDisplay); vo_x11_uninit(); } |