[Mplayer-cvslog] CVS: main/libvo x11_common.c,1.163,1.164

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

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

Modified Files:
	x11_common.c 
Log Message:
Use system clock for xscreensaver pings (Tobias Diedrich).


Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- x11_common.c	24 Feb 2004 18:17:05 -0000	1.163
+++ x11_common.c	16 Mar 2004 05:15:44 -0000	1.164
@@ -18,6 +18,7 @@
 #include "video_out.h"
 #include "aspect.h"
 #include "help_mp.h"
+#include "../osdep/timer.h"
 
 #include <X11/Xmd.h>
 #include <X11/Xlib.h>
@@ -1142,14 +1143,15 @@
 static Atom deactivate;
 static Atom screensaver;
 
-static float time_last;
+static unsigned int time_last;
 
-void xscreensaver_heartbeat(float time)
+void xscreensaver_heartbeat(void)
 {
+    unsigned int time = GetTimerMS();
     XEvent ev;
 
     if (mDisplay && xs_windowid &&
-	((time - time_last)>30 ||
+	((time - time_last)>30000 ||
 	 (time - time_last)<0)) {
 	time_last = time;