diff options
| author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-25 21:36:02 +0000 |
|---|---|---|
| committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-04-25 21:36:02 +0000 |
| commit | bee52bbd1045c9f74ee6f8ff57c53cfb433f0675 (patch) | |
| tree | 024471b2bc8378a3500177ffb9e69612c7553838 /Gui | |
| parent | ef6264e56eb0fdbc2f6984a1dc1ef841821b6cd6 (diff) | |
| download | mpv-bee52bbd1045c9f74ee6f8ff57c53cfb433f0675.tar.bz2 mpv-bee52bbd1045c9f74ee6f8ff57c53cfb433f0675.tar.xz | |
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.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18288 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
| -rw-r--r-- | Gui/mplayer/mw.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c index 77f30c4c9c..9c2062116e 100644 --- a/Gui/mplayer/mw.c +++ b/Gui/mplayer/mw.c @@ -78,7 +78,6 @@ void mplMainDraw( void ) 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 @@ set_volume: #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 ); |