[Mplayer-cvslog] CVS: main mencoder.c,1.179,1.180 mplayer.c,1.605,1.606 vobsub.c,1.22,1.23

[Arpi of Ize]

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

Modified Files:
	mencoder.c mplayer.c vobsub.c 
Log Message:
verbose can be negative


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -r1.179 -r1.180
--- mencoder.c	23 Oct 2002 22:07:11 -0000	1.179
+++ mencoder.c	1 Nov 2002 17:46:41 -0000	1.180
@@ -789,7 +789,7 @@
     lame_set_scale(lame,lame_param_scale);
 }
 lame_init_params(lame);
-if(verbose){
+if(verbose>0){
     lame_print_config(lame);
     lame_print_internals(lame);
 }
@@ -1113,7 +1113,7 @@
 	    (int)demuxer->filepos,
 	    (int)demuxer->movi_end);
 #else
-	if(verbose) {
+	if(verbose>0) {
 		mp_msg(MSGT_AVSYNC,MSGL_STATUS,"Pos:%6.1fs %6df (%2d%%) %3dfps Trem:%4dmin %3dmb  A-V:%5.3f [%d:%d] A/Vms %d/%d D/B/S %d/%d/%d \r",
 	    	mux_v->timer, decoded_frameno, (int)(p*100),
 	    	(t>1) ? (int)(decoded_frameno/t+0.5) : 0,

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.605
retrieving revision 1.606
diff -u -r1.605 -r1.606
--- mplayer.c	1 Nov 2002 16:10:15 -0000	1.605
+++ mplayer.c	1 Nov 2002 17:46:41 -0000	1.606
@@ -682,7 +682,7 @@
     }
 
     // Many users forget to include command line in bugreports...
-    if(verbose){
+    if(verbose>0){
       mp_msg(MSGT_CPLAYER, MSGL_INFO, "CommandLine:");
       for(i=1;i<argc;i++)printf(" '%s'",argv[i]);
       printf("\n");
@@ -1353,14 +1353,14 @@
 
 if(!sh_audio){
   mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_NoSound);
-  if(verbose) mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused audio chunks\n",d_audio->packs);
+  mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused audio chunks\n",d_audio->packs);
   ds_free_packs(d_audio); // free buffered chunks
   d_audio->id=-2;         // do not read audio chunks
   //uninit_player(INITED_AO); // close device
 }
 if(!sh_video){
    mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Video_NoVideo);
-   if(verbose) mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused video chunks\n",d_video->packs);
+   mp_msg(MSGT_CPLAYER,MSGL_V,"Freeing %d unused video chunks\n",d_video->packs);
    ds_free_packs(d_video);
    d_video->id=-2;
    //if(!fixed_vo) uninit_player(INITED_VO);
@@ -2525,7 +2525,7 @@
       if(sh_audio){
 	if(d_audio->packs == 0)
 	  ds_fill_buffer(d_audio);
-	if(verbose){
+	if(verbose>0){
 	    float a_pts=d_audio->pts;
             a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
 	    mp_msg(MSGT_AVSYNC,MSGL_V,"SEEK: A: %5.3f  V: %5.3f  A-V: %5.3f   \n",a_pts,d_video->pts,a_pts-d_video->pts);

Index: vobsub.c
===================================================================
RCS file: /cvsroot/mplayer/main/vobsub.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- vobsub.c	1 Nov 2002 00:01:53 -0000	1.22
+++ vobsub.c	1 Nov 2002 17:46:41 -0000	1.23
@@ -30,8 +30,6 @@
 
 extern int vobsub_id;
 
-extern int verbose;
-
 /**********************************************************************
  * RAR stream handling
  * The RAR file must have the same basename as the file to open
@@ -625,8 +623,7 @@
 	memcpy(vob->spu_streams[index].id, id, idlen);
     }
     vob->spu_streams_current = index;
-    if (verbose)
-	mp_msg(MSGT_VOBSUB,MSGL_V,"[vobsub] subtitle (vobsubid): %d language %s\n",
+    mp_msg(MSGT_VOBSUB,MSGL_V,"[vobsub] subtitle (vobsubid): %d language %s\n",
 		index, vob->spu_streams[index].id);
     return 0;
 }
@@ -919,8 +916,7 @@
 	    //custom colors: ON/OFF, tridx: XXXX, colors: XXXXXX, XXXXXX, XXXXXX,XXXXXX
 	    res = vobsub_parse_cuspal(vob, line) + vobsub_parse_tridx(line) + vobsub_parse_custom(vob, line);
 	else {
-	    if (verbose)
-		mp_msg(MSGT_VOBSUB,MSGL_V, "vobsub: ignoring %s", line);
+	    mp_msg(MSGT_VOBSUB,MSGL_V, "vobsub: ignoring %s", line);
 	    continue;
 	}
 	if (res < 0)