[Mplayer-cvslog] CVS: main/libmpdemux asfheader.c,1.35,1.36 aviheader.c,1.49,1.50 demux_ogg.c,1.16,1.17 demux_real.c,1.28,1.29 network.c,1.64,1.65 video.c,1.28,1.29

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv20982/libmpdemux

Modified Files:
	asfheader.c aviheader.c demux_ogg.c demux_real.c network.c 
	video.c 
Log Message:
verbose can be negative


Index: asfheader.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/asfheader.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- asfheader.c	23 Oct 2002 23:40:34 -0000	1.35
+++ asfheader.c	1 Nov 2002 17:46:43 -0000	1.36
@@ -151,7 +151,7 @@
     case ASF_GUID_PREFIX_stream_header:
       stream_read(demuxer->stream,(char*) &streamh,sizeof(streamh));
       le2me_ASF_stream_header_t(&streamh);
-      if(verbose){
+      if(verbose>0){
         mp_msg(MSGT_HEADER,MSGL_V,"stream type: %s\n",asf_chunk_type(streamh.type));
 	mp_msg(MSGT_HEADER,MSGL_V,"stream concealment: %s\n",asf_chunk_type(streamh.concealment));
 	mp_msg(MSGT_HEADER,MSGL_V,"type: %d bytes,  stream: %d bytes  ID: %d\n",(int)streamh.type_size,(int)streamh.stream_size,(int)streamh.stream_no);
@@ -233,7 +233,7 @@
         if( contenth.title_size!=0 ) {
           string=(char*)malloc(contenth.title_size);
           stream_read(demuxer->stream, string, contenth.title_size);
-          if(verbose)
+          if(verbose>0)
             print_asf_string(" Title: ", string, contenth.title_size);
 	  else
 	    pack_asf_string(string, contenth.title_size);
@@ -243,7 +243,7 @@
         if( contenth.author_size!=0 ) {
           string=(char*)realloc((void*)string, contenth.author_size);
           stream_read(demuxer->stream, string, contenth.author_size);
-          if(verbose)
+          if(verbose>0)
             print_asf_string(" Author: ", string, contenth.author_size);
 	  else
 	    pack_asf_string(string, contenth.author_size);
@@ -253,7 +253,7 @@
         if( contenth.copyright_size!=0 ) {
           string=(char*)realloc((void*)string, contenth.copyright_size);
           stream_read(demuxer->stream, string, contenth.copyright_size);
-          if(verbose)
+          if(verbose>0)
             print_asf_string(" Copyright: ", string, contenth.copyright_size);
 	  else
 	    pack_asf_string(string, contenth.copyright_size);
@@ -263,7 +263,7 @@
         if( contenth.comment_size!=0 ) {
           string=(char*)realloc((void*)string, contenth.comment_size);
           stream_read(demuxer->stream, string, contenth.comment_size);
-          if(verbose)
+          if(verbose>0)
             print_asf_string(" Comment: ", string, contenth.comment_size);
 	  else
 	    pack_asf_string(string, contenth.comment_size);
@@ -273,7 +273,7 @@
         if( contenth.rating_size!=0 ) {
           string=(char*)realloc((void*)string, contenth.rating_size);
           stream_read(demuxer->stream, string, contenth.rating_size);
-          if(verbose)
+          if(verbose>0)
             print_asf_string(" Rating: ", string, contenth.rating_size);
         }
 	mp_msg(MSGT_HEADER,MSGL_V,"\n");

Index: aviheader.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/aviheader.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- aviheader.c	17 Oct 2002 21:54:51 -0000	1.49
+++ aviheader.c	1 Nov 2002 17:46:43 -0000	1.50
@@ -156,7 +156,7 @@
       stream_read(demuxer->stream,(char*) &avih,MIN(size2,sizeof(avih)));
       le2me_MainAVIHeader(&avih); // swap to machine endian
       chunksize-=MIN(size2,sizeof(avih));
-      if(verbose) print_avih(&avih); // else print_avih_flags(&avih);
+      if(verbose>0) print_avih(&avih); // else print_avih_flags(&avih);
       break;
     case ckidSTREAMHEADER: {      // read 'strh'
       AVIStreamHeader h;

Index: demux_ogg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- demux_ogg.c	22 Oct 2002 15:41:41 -0000	1.16
+++ demux_ogg.c	1 Nov 2002 17:46:43 -0000	1.17
@@ -542,7 +542,7 @@
 	ogg_d->subs[ogg_d->num_sub].samplerate = sh_v->fps;
 	n_video++;
 	mp_msg(MSGT_DEMUX,MSGL_V,"OGG stream %d is video (old hdr)\n",ogg_d->num_sub);
-	if(verbose) print_video_header(sh_v->bih);
+	if(verbose>0) print_video_header(sh_v->bih);
 	// Old audio header
       } else if(get_uint32(pack.packet+96) == 0x05589F81) {
 	unsigned int extra_size;
@@ -563,7 +563,7 @@
 	ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate; // * sh_a->channels;
 	n_audio++;
 	mp_msg(MSGT_DEMUX,MSGL_V,"OGG stream %d is audio (old hdr)\n",ogg_d->num_sub);
-	if(verbose) print_wave_header(sh_a->wf);
+	if(verbose>0) print_wave_header(sh_a->wf);
       } else
 	mp_msg(MSGT_DEMUX,MSGL_WARN,"OGG stream %d contain an old header but the header type is unknow\n",ogg_d->num_sub);
 
@@ -591,7 +591,7 @@
 	ogg_d->subs[ogg_d->num_sub].samplerate= sh_v->fps;
 	n_video++;
 	mp_msg(MSGT_DEMUX,MSGL_V,"OGG stream %d is video (new hdr)\n",ogg_d->num_sub);
-	if(verbose) print_video_header(sh_v->bih);
+	if(verbose>0) print_video_header(sh_v->bih);
 	/// New audio header
       } else if(strncmp(st->streamtype,"audio",5) == 0) {
 	char buffer[5];
@@ -614,7 +614,7 @@
 	ogg_d->subs[ogg_d->num_sub].samplerate = sh_a->samplerate; // * sh_a->channels;
 	n_audio++;
 	mp_msg(MSGT_DEMUX,MSGL_V,"OGG stream %d is audio (new hdr)\n",ogg_d->num_sub);
-	if(verbose) print_wave_header(sh_a->wf);
+	if(verbose>0) print_wave_header(sh_a->wf);
 
 	/// Check for text (subtitles) header
       } else if (strncmp(st->streamtype, "text", 4) == 0) {

Index: demux_real.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_real.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- demux_real.c	10 Oct 2002 23:24:15 -0000	1.28
+++ demux_real.c	1 Nov 2002 17:46:43 -0000	1.29
@@ -8,6 +8,9 @@
     TODO: fix the whole syncing mechanism
     
     $Log$
+    Revision 1.29  2002/11/01 17:46:43  arpi
+    verbose can be negative
+
     Revision 1.28  2002/10/10 23:24:15  arpi
     stream selection cleanup, fixed -nosound
 
@@ -193,7 +196,7 @@
     real_index_table_t *index;
     int i, entries;
 
-    if (!verbose)
+    if (verbose<=0)
 	return;
     
     if (stream_id > MAX_STREAMS)

Index: network.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/network.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- network.c	29 Oct 2002 09:18:53 -0000	1.64
+++ network.c	1 Nov 2002 17:46:43 -0000	1.65
@@ -502,7 +502,7 @@
 			}
 
 			*fd_out=fd;
-			if( verbose ) {
+			if( verbose>0 ) {
 				http_debug_hdr( http_hdr );
 			}
 			

Index: video.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/video.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- video.c	21 Sep 2002 22:39:04 -0000	1.28
+++ video.c	1 Nov 2002 17:46:43 -0000	1.29
@@ -97,7 +97,7 @@
       int i=sync_video_packet(d_video);
       if(i==0x1B3) break; // found it!
       if(!i || !skip_video_packet(d_video)){
-        if(verbose)  mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n");
+        if(verbose>0)  mp_msg(MSGT_DECVIDEO,MSGL_V,"NONE :(\n");
         mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MpegNoSequHdr);
 	return 0;
       }