[MPlayer-cvslog] CVS: main mencoder.c, 1.345, 1.346 mplayer.c, 1.920, 1.921

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

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

Modified Files:
	mencoder.c mplayer.c 
Log Message:
Convert all if(verbose>X) to mp_msg_test calls.


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- mencoder.c	21 Mar 2006 23:09:52 -0000	1.345
+++ mencoder.c	24 Mar 2006 08:12:01 -0000	1.346
@@ -964,7 +964,7 @@
     break;
 }
 
-if (verbose>1) print_wave_header(mux_a->wf);
+if ( mp_msg_test(MSGT_MENCODER,MSGL_DBG2) ) print_wave_header(mux_a->wf);
 
 if (! ignore_start)
     muxer->audio_delay_fix += sh_audio->stream_delay;
@@ -1447,7 +1447,7 @@
 	    (int)demuxer->movi_end);
 #else
       if(!quiet) {
-	if(verbose>0) {
+	if( mp_msg_test(MSGT_AVSYNC,MSGL_V) ) {
 		mp_msg(MSGT_AVSYNC,MSGL_STATUS,"Pos:%6.1fs %6df (%2d%%) %3dfps Trem:%4dmin %3dmb  A-V:%5.3f [%d:%d] A/Vms %d/%d D/B/S %d/%d/%d \r",
 	    	mux_v->timer, decoded_frameno, (int)(p*100),
 	    	(t>1) ? (int)(decoded_frameno/t+0.5) : 0,

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.920
retrieving revision 1.921
diff -u -r1.920 -r1.921
--- mplayer.c	23 Mar 2006 15:17:23 -0000	1.920
+++ mplayer.c	24 Mar 2006 08:12:01 -0000	1.921
@@ -2110,7 +2110,7 @@
     }
 
     // Many users forget to include command line in bugreports...
-    if(verbose>0){
+    if( mp_msg_test(MSGT_CPLAYER,MSGL_V) ){
       mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CommandLine);
       for(i=1;i<argc;i++)mp_msg(MSGT_CPLAYER, MSGL_INFO," '%s'",argv[i]);
       mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n");
@@ -3358,7 +3358,7 @@
 	  
       }
 
-//      if(verbose>1)printf("sleep: %5.3f  a:%6.3f  v:%6.3f  \n",time_frame,sh_audio->timer,sh_video->timer);
+//      if(mp_msg_test(MSGT_CPLAYER,MSGL_DBG2)printf("sleep: %5.3f  a:%6.3f  v:%6.3f  \n",time_frame,sh_audio->timer,sh_video->timer);
 
       aq_sleep_time+=time_frame;
 
@@ -4592,7 +4592,7 @@
       if(sh_audio){
 	if(d_audio->packs == 0)
 	  ds_fill_buffer(d_audio);
-	if(verbose>0){
+	if( mp_msg_test(MSGT_AVSYNC,MSGL_V) ){
 	    float a_pts=d_audio->pts;
             a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
 	    mp_msg(MSGT_AVSYNC,MSGL_V,"SEEK: A: %5.3f  V: %5.3f  A-V: %5.3f   \n",a_pts,d_video->pts,a_pts-d_video->pts);