[MPlayer-dev-eng] a few patches

[Oswald Buddenhagen]

On Wed, Jan 21, 2004 at 06:45:00PM -0300, Diego Biurrun wrote:
> Oswald Buddenhagen writes:
>  > mp-quiet.diff adds -quiet/-noquiet switches to mencoder. quiet
>  > simply suppresses the progress information. this is a must-have
>  > when redirecting output to a log file.
>  >  
> 
> Since this is now a common option you should add this to cfg-common.h
> and not cfg-mencoder.h (and remove the quiet option from
> cfg-mplayer.h).
> 
ok, here is a revised version of this incredibly complicated patch. ;)
is it now going to be commited?

greetings

(and still cc: me)

-- 
Chaos, panic, and disorder - my work here is done.
-------------- next part --------------
Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.126
diff -U2 -r1.126 cfg-common.h
--- cfg-common.h	11 Jan 2004 17:07:31 -0000	1.126
+++ cfg-common.h	26 Jan 2004 01:01:25 -0000
@@ -3,4 +3,7 @@
 // ------------------------- stream options --------------------
 
+	{"quiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
+	{"noquiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
+
 #ifdef USE_STREAM_CACHE
 	{"cache", &stream_cache_size, CONF_TYPE_INT, CONF_RANGE, 4, 65536, NULL},
Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.75
diff -U2 -r1.75 cfg-mencoder.h
--- cfg-mencoder.h	23 Jan 2004 01:13:00 -0000	1.75
+++ cfg-mencoder.h	26 Jan 2004 01:01:25 -0000
@@ -231,5 +231,4 @@
 #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},
Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.212
diff -U2 -r1.212 cfg-mplayer.h
--- cfg-mplayer.h	24 Jan 2004 11:53:52 -0000	1.212
+++ cfg-mplayer.h	26 Jan 2004 01:01:25 -0000
@@ -421,6 +421,4 @@
         
 	{"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},
Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.231
diff -U2 -r1.231 mencoder.c
--- mencoder.c	23 Jan 2004 01:13:00 -0000	1.231
+++ mencoder.c	26 Jan 2004 01:01:27 -0000
@@ -130,4 +130,5 @@
 
 int verbose=0; // must be global!
+int quiet=0;
 double video_time_usage=0;
 double vout_time_usage=0;
@@ -1377,4 +1378,5 @@
 	    (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",
@@ -1399,4 +1401,5 @@
 	    (mux_a && mux_a->timer>1) ? (int)(mux_a->size/mux_a->timer/125) : 0
 	);
+      }
 #endif
     }