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

fix for xscreensaver disabling

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12788 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2004-07-09 18:59:55 +00:00
parent 367768db96
commit 6696304efe
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libvo/vo_sdl.c
View File

@ -1575,13 +1575,10 @@ static void
uninit(void)
{
#ifdef HAVE_X11
static Display *XDisplay;
XDisplay = XOpenDisplay(NULL);
if(XDisplay) {
struct sdl_priv_s *priv = &sdl_priv;
if(priv->X) {
if(verbose) printf("SDL: activating XScreensaver/DPMS\n");
saver_on(XDisplay);
XCloseDisplay(XDisplay);
vo_x11_uninit();
}
#endif
sdl_close();
@ -1597,10 +1594,6 @@ uninit(void)
static uint32_t preinit(const char *arg)
{
struct sdl_priv_s *priv = &sdl_priv;
#ifdef HAVE_X11
static Display *XDisplay;
static int XScreen;
#endif
priv->rgbsurface = NULL;
priv->overlay = NULL;
@ -1635,16 +1628,12 @@ static uint32_t preinit(const char *arg)
priv->X = 0;
#ifdef HAVE_X11
XDisplay = XOpenDisplay(NULL);
if(XDisplay) {
if(vo_init()) {
if(verbose) printf("SDL: deactivating XScreensaver/DPMS\n");
XScreen = DefaultScreen(XDisplay);
priv->XWidth = DisplayWidth(XDisplay, XScreen);
priv->XHeight = DisplayHeight(XDisplay, XScreen);
priv->XWidth = vo_screenwidth;
priv->XHeight = vo_screenheight;
priv->X = 1;
if(verbose) printf("SDL: X11 Resolution %ix%i\n", priv->XWidth, priv->XHeight);
saver_off(XDisplay);
XCloseDisplay(XDisplay);
}
#endif