Convert all if(verbose>X) to mp_msg_test calls.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2

7 files changed, 13 insertions, 14 deletions

diff --git a/libmpcodecs/ad_acm.c b/libmpcodecs/ad_acm.c
index 6b670d6760..7e60805fb2 100644
--- a/libmpcodecs/ad_acm.c
+++ b/libmpcodecs/ad_acm.c
@@ -74,7 +74,7 @@ static int preinit(sh_audio_t *sh_audio)
 //    priv->o_wf->wBitsPerSample = inf_fmt->wBitsPerSample;
     priv->o_wf->cbSize = 0;
     
-    if (verbose>0)
+    if ( mp_msg_test(MSGT_DECAUDIO,MSGL_V) )
     {
 	mp_msg(MSGT_DECAUDIO, MSGL_V, "Input format:\n");
 	print_wave_header(in_fmt);
@@ -98,7 +98,7 @@ static int preinit(sh_audio_t *sh_audio)
     mp_msg(MSGT_WIN32, MSGL_V, "Audio codec opened OK! ;-)\n");
     
     acmStreamSize(priv->handle, in_fmt->nBlockAlign, &srcsize, ACM_STREAMSIZEF_SOURCE);
-    //if (verbose) printf("Audio ACM output buffer min. size: %ld (reported by codec)\n", srcsize);
+    //if ( mp_msg_test(MSGT_DECAUDIO,MSGL_V) ) printf("Audio ACM output buffer min. size: %ld (reported by codec)\n", srcsize);
     srcsize *= 2;
     //if (srcsize < MAX_OUTBURST) srcsize = MAX_OUTBURST;
     if (!srcsize)
diff --git a/libmpcodecs/ad_twin.c b/libmpcodecs/ad_twin.c
index 8059106ced..c01d90cd27 100644
--- a/libmpcodecs/ad_twin.c
+++ b/libmpcodecs/ad_twin.c
@@ -110,11 +110,11 @@ static int init_vqf_audio_codec(sh_audio_t *sh_audio){
     priv->o_wf.wBitsPerSample=in_fmt->wBitsPerSample;
     priv->o_wf.cbSize=0;
 
-    if(verbose)
+    if( mp_msg_test(MSGT_DECAUDIO,MSGL_V) )
     {
-    mp_msg(MSGT_DECAUDIO, MSGL_INFO, "Input format:\n");
+    mp_msg(MSGT_DECAUDIO, MSGL_V, "Input format:\n");
     print_wave_header(in_fmt);
-    mp_msg(MSGT_DECAUDIO, MSGL_INFO, "Output fmt:\n");
+    mp_msg(MSGT_DECAUDIO, MSGL_V, "Output fmt:\n");
     print_wave_header(&priv->o_wf);
     }
     memcpy(&priv->hi,&in_fmt[1],sizeof(headerInfo));
diff --git a/libmpcodecs/ae_lame.c b/libmpcodecs/ae_lame.c
index d47e91dc0f..d0f4b051ad 100644
--- a/libmpcodecs/ae_lame.c
+++ b/libmpcodecs/ae_lame.c
@@ -70,7 +70,6 @@ m_option_t lameopts_conf[]={
 
 
 static int pass;
-extern int verbose;
 
 static int bind_lame(audio_encoder_t *encoder, muxer_stream_t *mux_a)
 {
@@ -192,7 +191,7 @@ int mpae_init_lame(audio_encoder_t *encoder)
         mp_msg(MSGT_MENCODER, MSGL_FATAL, MSGTR_LameCantInit); 
         return 0;
     }
-    if(verbose>0) {
+    if( mp_msg_test(MSGT_MENCODER,MSGL_V) ) {
         lame_print_config(lame);
         lame_print_internals(lame);
     }
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index 42b0697f2a..426fd05b09 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -174,7 +174,7 @@ int mpcodecs_config_vo(sh_video_t *sh, int w, int h, unsigned int preferred_outf
     // check if libvo and codec has common outfmt (no conversion):
 csp_again:
 
-    if(verbose>0){
+    if( mp_msg_test(MSGT_DECVIDEO,MSGL_V) ){
 	vf_instance_t* f=vf;
 	mp_msg(MSGT_DECVIDEO,MSGL_V,"Trying filter chain:");
 	for(f = vf ; f ; f = f->next)
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index b96973d45e..3818c3f0ae 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -1001,7 +1001,7 @@ static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic){
     }
     assert(avctx->draw_horiz_band == mc_render_slice);
     assert(avctx->release_buffer == mc_release_buffer);
-    if(verbose > 4)
+    if( mp_msg_test(MSGT_DECVIDEO,MSGL_DBG5) )
         printf("vd_ffmpeg::mc_get_buffer\n");
 
     if(init_vo(sh,avctx->pix_fmt) < 0){
@@ -1068,7 +1068,7 @@ static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic){
     pic->type= FF_BUFFER_TYPE_USER;
 
     render=(xvmc_render_state_t*)mpi->priv;//same as data[2]
-    if(verbose > 4)
+    if( mp_msg_test(MSGT_DECVIDEO,MSGL_DBG5) )
         printf("vd_ffmpeg::mc_get_buffer (render=%p)\n",render);
     assert(render != 0);
     assert(render->magic == MP_XVMC_RENDER_MAGIC);
@@ -1095,7 +1095,7 @@ static void mc_release_buffer(AVCodecContext *avctx, AVFrame *pic){
 //printf("R%X %X\n", pic->linesize[0], pic->data[0]);
 //mark the surface as not requared for prediction
     render=(xvmc_render_state_t*)pic->data[2];//same as mpi->priv
-    if(verbose > 4)
+    if( mp_msg_test(MSGT_DECVIDEO,MSGL_DBG5) )
         printf("vd_ffmpeg::mc_release_buffer (render=%p)\n",render);
     assert(render!=NULL);
     assert(render->magic==MP_XVMC_RENDER_MAGIC);
diff --git a/libmpcodecs/vd_vfw.c b/libmpcodecs/vd_vfw.c
index e13097d67e..eb8d304a29 100644
--- a/libmpcodecs/vd_vfw.c
+++ b/libmpcodecs/vd_vfw.c
@@ -241,9 +241,9 @@ static int init(sh_video_t *sh){
 	set_csp(priv->o_bih,sh->codec->outfmt[sh->outfmtidx]);
 
     mp_msg(MSGT_WIN32, MSGL_V, "Input format:\n");
-    if(verbose>0) print_video_header(sh->bih);
+    if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh->bih);
     mp_msg(MSGT_WIN32, MSGL_V, "Output format:\n");
-    if(verbose>0) print_video_header(priv->o_bih);
+    if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(priv->o_bih);
 
     // set postprocessing level in xvid/divx4 .dll
     ICSendMessage(priv->handle, ICM_USER+80, (long)(&divx_quality), 0);
diff --git a/libmpcodecs/vf_scale.c b/libmpcodecs/vf_scale.c
index fc4ce1c48a..6dd093251a 100644
--- a/libmpcodecs/vf_scale.c
+++ b/libmpcodecs/vf_scale.c
@@ -522,7 +522,7 @@ void sws_getFlagsAndFilterFromCmdLine(int *flags, SwsFilter **srcFilterParam, Sw
 		firstTime=0;
 		*flags= SWS_PRINT_INFO;
 	}
-	else if(verbose>1) *flags= SWS_PRINT_INFO;
+	else if( mp_msg_test(MSGT_VFILTER,MSGL_DBG2) ) *flags= SWS_PRINT_INFO;
 
 	if(src_filter) sws_freeFilter(src_filter);