[MPlayer-cvslog] CVS: main/libmpcodecs ad_acm.c, 1.17, 1.18 ad_twin.c, 1.3, 1.4 vd_vfw.c, 1.28, 1.29

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

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

Modified Files:
	ad_acm.c ad_twin.c vd_vfw.c 
Log Message:
Convert printfs in aviprint.c to mp_msg and give the information printing
functions in this file a verbosity_level parameter.


Index: ad_acm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_acm.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ad_acm.c	24 Mar 2006 08:12:02 -0000	1.17
+++ ad_acm.c	27 Mar 2006 17:25:41 -0000	1.18
@@ -40,7 +40,7 @@
   return 1;
 }
 
-extern void print_wave_header(WAVEFORMATEX *h);
+extern void print_wave_header(WAVEFORMATEX *h, int verbose_level);
 
 static int preinit(sh_audio_t *sh_audio)
 {
@@ -77,9 +77,9 @@
     if ( mp_msg_test(MSGT_DECAUDIO,MSGL_V) )
     {
 	mp_msg(MSGT_DECAUDIO, MSGL_V, "Input format:\n");
-	print_wave_header(in_fmt);
+	print_wave_header(in_fmt, MSGL_V);
 	mp_msg(MSGT_DECAUDIO, MSGL_V, "Output format:\n");
-	print_wave_header(priv->o_wf);
+	print_wave_header(priv->o_wf, MSGL_V);
     }
 
     MSACM_RegisterDriver((const char *)sh_audio->codec->dll, in_fmt->wFormatTag, 0);

Index: ad_twin.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_twin.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ad_twin.c	24 Mar 2006 08:12:02 -0000	1.3
+++ ad_twin.c	27 Mar 2006 17:25:41 -0000	1.4
@@ -90,7 +90,7 @@
      TvqGetNumFixedBitsPerFrame;
 }
 
-extern void print_wave_header(WAVEFORMATEX *h);
+extern void print_wave_header(WAVEFORMATEX *h, int verbose_level);
 static int init_vqf_audio_codec(sh_audio_t *sh_audio){
     WAVEFORMATEX *in_fmt=sh_audio->wf;
     vqf_priv_t*priv=sh_audio->context;
@@ -113,9 +113,9 @@
     if( mp_msg_test(MSGT_DECAUDIO,MSGL_V) )
     {
     mp_msg(MSGT_DECAUDIO, MSGL_V, "Input format:\n");
-    print_wave_header(in_fmt);
+    print_wave_header(in_fmt, MSGL_V);
     mp_msg(MSGT_DECAUDIO, MSGL_V, "Output fmt:\n");
-    print_wave_header(&priv->o_wf);
+    print_wave_header(&priv->o_wf, MSGL_V);
     }
     memcpy(&priv->hi,&in_fmt[1],sizeof(headerInfo));
     if((ver=TvqInitialize(&priv->hi,&priv->index,0))){

Index: vd_vfw.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_vfw.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- vd_vfw.c	24 Mar 2006 08:12:02 -0000	1.28
+++ vd_vfw.c	27 Mar 2006 17:25:41 -0000	1.29
@@ -138,7 +138,7 @@
     return CONTROL_UNKNOWN;
 }
 
-extern void print_video_header(BITMAPINFOHEADER *h);
+extern void print_video_header(BITMAPINFOHEADER *h, int verbose_level);
 
 // init driver
 static int init(sh_video_t *sh){
@@ -241,9 +241,9 @@
 	set_csp(priv->o_bih,sh->codec->outfmt[sh->outfmtidx]);
 
     mp_msg(MSGT_WIN32, MSGL_V, "Input format:\n");
-    if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh->bih);
+    if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh->bih,MSGL_V);
     mp_msg(MSGT_WIN32, MSGL_V, "Output format:\n");
-    if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(priv->o_bih);
+    if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(priv->o_bih,MSGL_V);
 
     // set postprocessing level in xvid/divx4 .dll
     ICSendMessage(priv->handle, ICM_USER+80, (long)(&divx_quality), 0);