[MPlayer-cvslog] CVS: main/Gui/mplayer mw.c,1.120,1.121

[Uoti Urpala CVS]

CVS change done by Uoti Urpala CVS

Update of /cvsroot/mplayer/main/Gui/mplayer
In directory mail:/var2/tmp/cvs-serv27348/Gui/mplayer

Modified Files:
	mw.c 
Log Message:
Remove updating of vo_mouse_timer_const from the main loop and also
remove the variable itself. Convert code in x11_common.c and OSD timing
that depended on the variable to use real time instead.


Index: mw.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.c,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- mw.c	22 Apr 2006 13:24:20 -0000	1.120
+++ mw.c	25 Apr 2006 21:36:01 -0000	1.121
@@ -78,7 +78,6 @@
 
 extern void exit_player(char* how);
 extern int vcd_track;
-extern int osd_visible;
 static unsigned last_redraw_time = 0;
 
 void mplEventHandling( int msg,float param )
@@ -271,7 +270,7 @@
 #ifdef USE_OSD
 	if ( osd_level )
 	 {
-	  osd_visible=vo_mouse_timer_const;
+	  osd_visible=(GetTimerMS() + 1000) | 1;
 	  vo_osd_progbar_type=OSD_VOLUME;
 	  vo_osd_progbar_value=( ( guiIntfStruct.Volume ) * 256.0 ) / 100.0;
 	  vo_osd_changed( OSDTYPE_PROGBAR );