mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
Code

removed saver_on, saver_off calls, they are already in x11_common.c

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12896 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2004-07-25 12:49:01 +00:00
parent ce1d9c664c
commit d7d2ea1551
8 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libvo/vo_gl.c
View File

@ -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"); // printf("OpenGL setup OK!\n");
saver_off(mDisplay); // turning off screen saver
if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop); if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
return 0; return 0;
@ -354,7 +352,6 @@ static void
uninit(void) uninit(void)
{ {
if ( !vo_config_count ) return; if ( !vo_config_count ) return;
saver_on(mDisplay); // screen saver back on
vo_x11_uninit(); vo_x11_uninit();
} }

1
libvo/vo_gl2.c
View File

@ -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) if (initGl(d_width, d_height) == -1)
return -1; return -1;
#ifndef GL_WIN32 #ifndef GL_WIN32
saver_off(mDisplay);
if (vo_ontop) vo_x11_setlayer(mDisplay,vo_window, vo_ontop); if (vo_ontop) vo_x11_setlayer(mDisplay,vo_window, vo_ontop);
#endif #endif

3
libvo/vo_x11.c
View File

@ -535,8 +535,6 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
} }
#endif #endif
saver_off(mDisplay);
if (vo_ontop) if (vo_ontop)
vo_x11_setlayer(mDisplay, vo_window, vo_ontop); vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
@ -724,7 +722,6 @@ static void uninit(void)
return; return;
freeMyXImage(); freeMyXImage();
saver_on(mDisplay); // screen saver back on
#ifdef HAVE_XF86VM #ifdef HAVE_XF86VM
vo_vm_close(mDisplay); vo_vm_close(mDisplay);

3
libvo/vo_xmga.c
View File

@ -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 set_window(); // set up mga_vid_config.dest_width etc
saver_off(mDisplay);
if (vo_ontop) if (vo_ontop)
vo_x11_setlayer(mDisplay, vo_window, vo_ontop); vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
@ -292,6 +290,5 @@ static void uninit(void)
if (!inited) if (!inited)
return; // no window? return; // no window?
inited = 0; inited = 0;
saver_on(mDisplay);
vo_x11_uninit(); // destroy the window vo_x11_uninit(); // destroy the window
} }

3
libvo/vo_xover.c
View File

@ -352,8 +352,6 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
panscan_calc(); panscan_calc();
saver_off(mDisplay); /* turning off screen saver */
return(0); return(0);
} }
@ -404,7 +402,6 @@ static void uninit(void)
if(!vo_config_count) return; if(!vo_config_count) return;
if(sub_vo) sub_vo->uninit(); if(sub_vo) sub_vo->uninit();
sub_vo = NULL; sub_vo = NULL;
saver_on(mDisplay); /* screen saver back on */
vo_x11_uninit(); vo_x11_uninit();
// Restore our callbacks // Restore our callbacks
video_out_xover.draw_frame = draw_frame; video_out_xover.draw_frame = draw_frame;

3
libvo/vo_xv.c
View File

@ -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, mp_msg(MSGT_VO, MSGL_V, "[xv] dx: %d dy: %d dw: %d dh: %d\n", drwX,
drwY, vo_dwidth, vo_dheight); drwY, vo_dwidth, vo_dheight);
saver_off(mDisplay); // turning off screen saver
if (vo_ontop) if (vo_ontop)
vo_x11_setlayer(mDisplay, vo_window, vo_ontop); vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
@ -765,7 +763,6 @@ static void uninit(void)
return; return;
XvFreeAdaptorInfo(ai); XvFreeAdaptorInfo(ai);
ai = NULL; ai = NULL;
saver_on(mDisplay); // screen saver back on
for (i = 0; i < num_buffers; i++) for (i = 0; i < num_buffers; i++)
deallocate_xvimage(i); deallocate_xvimage(i);
#ifdef HAVE_XF86VM #ifdef HAVE_XF86VM

3
libvo/vo_xvidix.c
View File

@ -419,8 +419,6 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
if (vo_ontop) if (vo_ontop)
vo_x11_setlayer(mDisplay, vo_window, vo_ontop); vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
saver_off(mDisplay); /* turning off screen saver */
return (0); return (0);
} }
@ -489,7 +487,6 @@ static void uninit(void)
vidix_name = NULL; vidix_name = NULL;
} }
saver_on(mDisplay); /* screen saver back on */
vo_x11_uninit(); vo_x11_uninit();
} }

2
libvo/vo_xvmc.c
View File

@ -794,7 +794,6 @@ found_subpic:
if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop); if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
saver_off(mDisplay); // turning off screen saver
//end vo_xv //end vo_xv
/* store image dimesions for displaying */ /* store image dimesions for displaying */
@ -1208,7 +1207,6 @@ static void uninit(void){
if( verbose > 3 ) printf("vo_xvmc: uninit called\n"); if( verbose > 3 ) printf("vo_xvmc: uninit called\n");
xvmc_free(); xvmc_free();
//from vo_xv //from vo_xv
saver_on(mDisplay);
vo_vm_close(mDisplay); vo_vm_close(mDisplay);
vo_x11_uninit(); vo_x11_uninit();
} }