diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-01 17:46:45 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-01 17:46:45 +0000 |
commit | 39fe4d0cd39059a6b020bf82a055bf51bac3c58b (patch) | |
tree | 89ce3b5e666c35fee409f680e4365c024f12f4ad /libmpdemux | |
parent | 94b6f5babac8c35c6ffcd238985980fc44aa3eeb (diff) | |
download | mpv-39fe4d0cd39059a6b020bf82a055bf51bac3c58b.tar.bz2 mpv-39fe4d0cd39059a6b020bf82a055bf51bac3c58b.tar.xz |
verbose can be negative
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8028 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/asfheader.c | 12 | ||||
-rw-r--r-- | libmpdemux/aviheader.c | 2 | ||||
-rw-r--r-- | libmpdemux/demux_ogg.c | 8 | ||||
-rw-r--r-- | libmpdemux/demux_real.c | 5 | ||||
-rw-r--r-- | libmpdemux/network.c | 2 | ||||
-rw-r--r-- | libmpdemux/video.c | 2 |
6 files changed, 17 insertions, 14 deletions
diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c index 8393036a6b..bab9928072 100644 --- a/libmpdemux/asfheader.c +++ b/libmpdemux/asfheader.c @@ -151,7 +151,7 @@ while(!stream_eof(demuxer->stream)){ 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 @@ while(!stream_eof(demuxer->stream)){ 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 @@ while(!stream_eof(demuxer->stream)){ 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 @@ while(!stream_eof(demuxer->stream)){ 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 @@ while(!stream_eof(demuxer->stream)){ 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 @@ while(!stream_eof(demuxer->stream)){ 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"); diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c index 095fbdc86a..40ec3f9841 100644 --- a/libmpdemux/aviheader.c +++ b/libmpdemux/aviheader.c @@ -156,7 +156,7 @@ while(1){ 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; diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index c5e7c98208..dd644429ca 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -542,7 +542,7 @@ int demux_ogg_open(demuxer_t* demuxer) { 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 @@ int demux_ogg_open(demuxer_t* demuxer) { 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 @@ int demux_ogg_open(demuxer_t* demuxer) { 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 @@ int demux_ogg_open(demuxer_t* demuxer) { 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) { diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c index d3ed8d3064..70cbef719c 100644 --- a/libmpdemux/demux_real.c +++ b/libmpdemux/demux_real.c @@ -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 @@ static void dump_index(demuxer_t *demuxer, int stream_id) real_index_table_t *index; int i, entries; - if (!verbose) + if (verbose<=0) return; if (stream_id > MAX_STREAMS) diff --git a/libmpdemux/network.c b/libmpdemux/network.c index 56e6456817..5bd9724588 100644 --- a/libmpdemux/network.c +++ b/libmpdemux/network.c @@ -502,7 +502,7 @@ extension=NULL; } *fd_out=fd; - if( verbose ) { + if( verbose>0 ) { http_debug_hdr( http_hdr ); } diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 00bf0e379c..b883142b62 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -97,7 +97,7 @@ switch(d_video->demuxer->file_format){ 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; } |