Fixed bug in libvo for stop-xscreensaver

[mplayer@…]

Here comes a patch that corrects the fact that libvo doesn't call saver_off()
again when re-initing video output for subsequent files. Besides, the frequency
of heartbeats should be higher (I set it to 900 ms, though I think this should
be a compile-time tunable option).

I was also wondering whether it is mplayer's initiative to disable X blanking
(not xscreensaver) during the whole time a video window is open). Do you know
anything about that?

diff -ru MPlayer-20041111-orig/libvo/x11_common.c
MPlayer-20041111/libvo/x11_common.c
--- MPlayer-20041111-orig/libvo/x11_common.c 2004-11-12 01:40:03.000000000 +0100
+++ MPlayer-20041111/libvo/x11_common.c 2004-11-12 01:43:40.000000000 +0100
@@ -370,8 +370,7 @@

if (vo_rootwin)

WinID = 0; use root win

• if (vo_depthonscreen)
• return 1; already called

+ if (!vo_depthonscreen) {

XSetErrorHandler(x11_errorhandler);

@@ -503,6 +502,7 @@

fstype_dump(vo_fs_type);

+ }

saver_off(mDisplay);
return 1;

}

[reimar]

Alternative version

[reimar]

I personally would prefer this equivalent solution. A 100+ line block does not
make it easier to understand the code. I still hope for a complete redo of the
x11_common code, it looks broken all over the place...

[reimar]

Fixed in CVS.