printf->mp_msg/mp_dbg

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

1 files changed, 20 insertions, 19 deletions

diff --git a/demux_asf.c b/demux_asf.c
index e7d4ac3f3e..c159c7c154 100644
--- a/demux_asf.c
+++ b/demux_asf.c
@@ -4,7 +4,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-extern int verbose; // defined in mplayer.c
+#include "config.h"
+#include "mp_msg.h"
 
 #include "stream.h"
 #include "asf.h"
@@ -42,7 +43,7 @@ static void asf_descrambling(unsigned char *src,int len){
   unsigned char *s2=src;
   int i=0,x,y;
   while(len-i>=asf_scrambling_h*asf_scrambling_w*asf_scrambling_b){
-//    printf("descrambling! (w=%d  b=%d)\n",w,asf_scrambling_b);
+//    mp_msg(MSGT_DEMUX,MSGL_DBG4,"descrambling! (w=%d  b=%d)\n",w,asf_scrambling_b);
 	//i+=asf_scrambling_h*asf_scrambling_w;
 	for(x=0;x<asf_scrambling_w;x++)
 	  for(y=0;y<asf_scrambling_h;y++){
@@ -60,7 +61,7 @@ static void asf_descrambling(unsigned char *src,int len){
 static int demux_asf_read_packet(demuxer_t *demux,unsigned char *data,int len,int id,int seq,unsigned long time,unsigned short dur,int offs,int keyframe){
   demux_stream_t *ds=NULL;
   
-  if(verbose>=4) printf("demux_asf.read_packet: id=%d seq=%d len=%d\n",id,seq,len);
+  mp_dbg(MSGT_DEMUX,MSGL_DBG4,"demux_asf.read_packet: id=%d seq=%d len=%d\n",id,seq,len);
   
   if(demux->video->id==-1)
     if(demux->v_streams[id])
@@ -75,7 +76,7 @@ static int demux_asf_read_packet(demuxer_t *demux,unsigned char *data,int len,in
       ds=demux->audio;
       if(!ds->sh){
         ds->sh=demux->a_streams[id];
-        if(verbose) printf("Auto-selected ASF audio ID = %d\n",ds->id);
+        mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected ASF audio ID = %d\n",ds->id);
       }
   } else 
   if(id==demux->video->id){
@@ -83,7 +84,7 @@ static int demux_asf_read_packet(demuxer_t *demux,unsigned char *data,int len,in
       ds=demux->video;
       if(!ds->sh){
         ds->sh=demux->v_streams[id];
-        if(verbose) printf("Auto-selected ASF video ID = %d\n",ds->id);
+        mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected ASF video ID = %d\n",ds->id);
       }
   }
   
@@ -99,10 +100,10 @@ static int demux_asf_read_packet(demuxer_t *demux,unsigned char *data,int len,in
       } else {
         // append data to it!
         demux_packet_t* dp=ds->asf_packet;
-        if(dp->len!=offs && offs!=-1) printf("warning! fragment.len=%d BUT next fragment offset=%d  \n",dp->len,offs);
+        if(dp->len!=offs && offs!=-1) mp_msg(MSGT_DEMUX,MSGL_V,"warning! fragment.len=%d BUT next fragment offset=%d  \n",dp->len,offs);
         dp->buffer=realloc(dp->buffer,dp->len+len);
         memcpy(dp->buffer+dp->len,data,len);
-        if(verbose>=4) printf("data appended! %d+%d\n",dp->len,len);
+        mp_dbg(MSGT_DEMUX,MSGL_DBG4,"data appended! %d+%d\n",dp->len,len);
         dp->len+=len;
         // we are ready now.
         return 1;
@@ -111,7 +112,7 @@ static int demux_asf_read_packet(demuxer_t *demux,unsigned char *data,int len,in
     // create new packet:
     { demux_packet_t* dp;
       if(offs>0){
-        if(verbose) printf("warning!  broken fragment, %d bytes missing  \n",offs);
+        mp_msg(MSGT_DEMUX,MSGL_V,"warning!  broken fragment, %d bytes missing  \n",offs);
         return 0;
       }
       dp=new_demux_packet(len);
@@ -172,12 +173,12 @@ int demux_asf_fill_buffer(demuxer_t *demux){
             if(flags&0x40){
               // Explicit (absoulte) packet size
               plen=LOAD_LE16(p); p+=2;
-              if(verbose>1)printf("Explicit packet size specified: %d  \n",plen);
-              if(plen>asf_packetsize) printf("Warning! plen>packetsize! (%d>%d)  \n",plen,asf_packetsize);
+              mp_dbg(MSGT_DEMUX,MSGL_DBG2,"Explicit packet size specified: %d  \n",plen);
+              if(plen>asf_packetsize) mp_msg(MSGT_DEMUX,MSGL_V,"Warning! plen>packetsize! (%d>%d)  \n",plen,asf_packetsize);
               if(flags&(8|16)){
                 padding=p[0];p++;
                 if(flags&16){ padding|=p[0]<<8; p++;}
-                if(verbose)printf("Warning! explicit=%d  padding=%d  \n",plen,asf_packetsize-padding);
+                mp_msg(MSGT_DEMUX,MSGL_V,"Warning! explicit=%d  padding=%d  \n",plen,asf_packetsize-padding);
               }
             } else {
               // Padding (relative) size
@@ -197,7 +198,7 @@ int demux_asf_fill_buffer(demuxer_t *demux){
               segs=p[0] & 0x3F;
               ++p;
             }
-            if(verbose>=4) printf("%08X:  flag=%02X  segs=%d  pad=%d  time=%ld  dur=%d\n",
+            mp_dbg(MSGT_DEMUX,MSGL_DBG4,"%08X:  flag=%02X  segs=%d  pad=%d  time=%ld  dur=%d\n",
               demux->filepos,flags,segs,padding,time,duration);
             for(seg=0;seg<segs;seg++){
               //ASF_segmhdr_t* sh;
@@ -209,7 +210,7 @@ int demux_asf_fill_buffer(demuxer_t *demux){
               unsigned long time2;
 	      int keyframe=0;
 
-              if(p>=p_end) printf("Warning! invalid packet 1, sig11 coming soon...\n");
+              if(p>=p_end) mp_msg(MSGT_DEMUX,MSGL_V,"Warning! invalid packet 1, sig11 coming soon...\n");
 
               if(verbose>1){
                 int i;
@@ -237,7 +238,7 @@ int demux_asf_fill_buffer(demuxer_t *demux){
                  p+=4;
                  break;
               default:
-                 printf("Warning! unknown segtype == 0x%2X  \n",segtype);
+                 mp_msg(MSGT_DEMUX,MSGL_V,"Warning! unknown segtype == 0x%2X  \n",segtype);
 		 x=0;
               }
 
@@ -254,7 +255,7 @@ int demux_asf_fill_buffer(demuxer_t *demux){
                 time2=LOAD_LE32(p);p+=4;
                 break;
               default:
-                printf("unknown segment type: 0x%02X  \n",type);
+                mp_msg(MSGT_DEMUX,MSGL_V,"unknown segment type: 0x%02X  \n",type);
               }
 
               if(flags&1){
@@ -269,9 +270,9 @@ int demux_asf_fill_buffer(demuxer_t *demux){
                 len=plen-(p-asf_packet);
               }
               if(len<0 || (p+len)>=p_end){
-                printf("ASF_parser: warning! segment len=%d\n",len);
+                mp_msg(MSGT_DEMUX,MSGL_V,"ASF_parser: warning! segment len=%d\n",len);
               }
-              if(verbose>=4) printf("  seg #%d: streamno=%d  seq=%d  type=%02X  len=%d\n",seg,streamno,seq,type,len);
+              mp_dbg(MSGT_DEMUX,MSGL_DBG4,"  seg #%d: streamno=%d  seq=%d  type=%02X  len=%d\n",seg,streamno,seq,type,len);
 
               switch(type){
               case 0x01:
@@ -287,7 +288,7 @@ int demux_asf_fill_buffer(demuxer_t *demux){
 		  len-=len2+1;
 		}
                 if(len!=0){
-                  printf("ASF_parser: warning! groups total != len\n");
+                  mp_msg(MSGT_DEMUX,MSGL_V,"ASF_parser: warning! groups total != len\n");
                 }
                 break;
               case 0x08:
@@ -302,7 +303,7 @@ int demux_asf_fill_buffer(demuxer_t *demux){
             return 1; // success
     }
     
-    printf("%08X:  UNKNOWN TYPE  %02X %02X %02X %02X %02X...\n",demux->filepos,asf_packet[0],asf_packet[1],asf_packet[2],asf_packet[3],asf_packet[4]);
+    mp_msg(MSGT_DEMUX,MSGL_V,"%08X:  UNKNOWN TYPE  %02X %02X %02X %02X %02X...\n",demux->filepos,asf_packet[0],asf_packet[1],asf_packet[2],asf_packet[3],asf_packet[4]);
     return 0;
 }