[Mplayer-cvslog] CVS: main cfg-common.h, 1.126, 1.127 cfg-mencoder.h, 1.75, 1.76 cfg-mplayer.h, 1.212, 1.213 mencoder.c, 1.231, 1.232 mplayer.c, 1.744, 1.745

[Attila Kinali CVS]

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

Modified Files:
	cfg-common.h cfg-mencoder.h cfg-mplayer.h mencoder.c mplayer.c 
Log Message:
* changes mencoder's exit code on explicit kill to 2
* add quiet/noquiet to mencoder
* dont depend targets on themselfs
patch by Oswald Buddenhagen <ossi at kde.org>
additionaly moved quiet/noquiet and v/verbose to cfg-common.h


Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- cfg-common.h	11 Jan 2004 17:07:31 -0000	1.126
+++ cfg-common.h	29 Jan 2004 12:01:25 -0000	1.127
@@ -1,5 +1,11 @@
 #ifdef MAIN_CONF /* this will be included in conf[] */
 
+// ------------------------- common optionss --------------------
+	{"quiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
+	{"noquiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
+	{"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 100, NULL},
+	{"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOSAVE, 0, 0, NULL},
+
 // ------------------------- stream options --------------------
 
 #ifdef USE_STREAM_CACHE
@@ -266,6 +272,9 @@
 
 #include "config.h"
 
+extern int quiet;
+extern int verbose;
+
 // codec/filter opts: (defiend at libmpcodecs/vd.c)
 extern float screen_size_xy;
 extern float movie_aspect;

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- cfg-mencoder.h	23 Jan 2004 01:13:00 -0000	1.75
+++ cfg-mencoder.h	29 Jan 2004 12:01:25 -0000	1.76
@@ -230,9 +230,6 @@
 #include "cfg-common.h"
 #undef MAIN_CONF
 
-//	{"quiet", &quiet, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-	{"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 100, NULL},
-	{"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, NULL},
 //	{"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 //	{"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 //	{"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- cfg-mplayer.h	24 Jan 2004 11:53:52 -0000	1.212
+++ cfg-mplayer.h	29 Jan 2004 12:01:25 -0000	1.213
@@ -420,11 +420,7 @@
 #undef MAIN_CONF
         
 	{"identify", &identify, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
-	{"quiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
-	{"noquiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
 	{"really-quiet", &verbose, CONF_TYPE_FLAG, CONF_GLOBAL, 0, -10, NULL},
-	{"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 100, NULL},
-	{"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOSAVE, 0, 0, NULL},
 	{"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
 	{"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
 	{"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -r1.231 -r1.232
--- mencoder.c	23 Jan 2004 01:13:00 -0000	1.231
+++ mencoder.c	29 Jan 2004 12:01:25 -0000	1.232
@@ -129,6 +129,7 @@
 //void resync_audio_stream(sh_audio_t *sh_audio){}
 
 int verbose=0; // must be global!
+int quiet=0;
 double video_time_usage=0;
 double vout_time_usage=0;
 double max_video_time_usage=0;
@@ -317,7 +318,7 @@
 
 static void exit_sighandler(int x){
     at_eof=1;
-    interrupted=1;
+    interrupted=2; /* 1 means error */
 }
 
 static muxer_t* muxer=NULL;
@@ -1376,6 +1377,7 @@
 	    (int)demuxer->filepos,
 	    (int)demuxer->movi_end);
 #else
+      if(!quiet) {
 	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),
@@ -1398,6 +1400,7 @@
 	    (mux_v->timer>1) ? (int)(mux_v->size/mux_v->timer/125) : 0,
 	    (mux_a && mux_a->timer>1) ? (int)(mux_a->size/mux_a->timer/125) : 0
 	);
+      }
 #endif
     }
         fflush(stdout);

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.744
retrieving revision 1.745
diff -u -r1.744 -r1.745
--- mplayer.c	12 Jan 2004 03:47:49 -0000	1.744
+++ mplayer.c	29 Jan 2004 12:01:25 -0000	1.745
@@ -82,7 +82,7 @@
 int slave_mode=0;
 int verbose=0;
 int identify=0;
-static int quiet=0;
+int quiet=0;
 
 #define ABS(x) (((x)>=0)?(x):(-(x)))
 #define ROUND(x) ((int)((x)<0 ? (x)-0.5 : (x)+0.5))