[Mplayer-cvslog] CVS: main mplayer.c,1.221,1.222

Adam Tla/lka atlka at mplayer.dev.hu
Thu Aug 16 15:56:31 CEST 2001


Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv12777

Modified Files:
	mplayer.c 
Log Message:

removed duplicated setting of osd timeout


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- mplayer.c	16 Aug 2001 09:25:31 -0000	1.221
+++ mplayer.c	16 Aug 2001 13:56:29 -0000	1.222
@@ -1456,8 +1456,11 @@
 
   if(osd_function==OSD_PAUSE){
       printf("\n------ PAUSED -------\r");fflush(stdout);
-      if (audio_out && sh_audio)
+      if (audio_out && sh_audio) {
+         current_module="pause_audio";
          audio_out->pause();	// pause audio, keep data if possible
+      }
+
 #ifdef HAVE_GUI
       if ( nogui )
         {
@@ -1699,14 +1702,13 @@
         }
       }
 #endif
-      
-      c_total=0;
+
       max_pts_correction=0.1;
-      osd_visible=sh_video->fps; // to rewert to PLAY pointer after 1 sec
-      audio_time_usage=0; video_time_usage=0; vout_time_usage=0;
-      drop_frame_cnt=0;
+      audio_time_usage=video_time_usage=vout_time_usage=0;
+      c_total=drop_frame_cnt=0;
   
   }
+   
   rel_seek_secs=0;
   current_module=NULL;
 }




More information about the MPlayer-cvslog mailing list