[MPlayer-cvslog] CVS: main codec-cfg.c, 1.122, 1.123 mp_msg.c, 1.30, 1.31 mplayer.c, 1.893, 1.894 mencoder.c, 1.323, 1.324

[Oded Shimon CVS]

CVS change done by Oded Shimon CVS

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

Modified Files:
	codec-cfg.c mp_msg.c mplayer.c mencoder.c 
Log Message:
Some more cola for msglevel, codec-cfg can't even call mp_msg_init or it'll 
print bogus stuff.


Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- codec-cfg.c	6 Dec 2005 12:03:51 -0000	1.122
+++ codec-cfg.c	7 Dec 2005 05:12:07 -0000	1.123
@@ -886,10 +886,6 @@
 int use_gui = 0;
 #endif
 
-int mp_msg_levels[MSGT_MAX];
-int mp_msg_level_all = MSGL_ERR;
-int verbose = 0;
-
 void wrapline(FILE *f2,char *s){
     int c;
     if(!s){
@@ -1002,8 +998,6 @@
         int dshow=-1;
         int win32ex=-1;
 
-	mp_msg_init();
-
 	/*
 	 * Take path to codecs.conf from command line, or fall back on
 	 * etc/codecs.conf
@@ -1152,17 +1146,11 @@
 #endif
 
 #ifdef TESTING
-int mp_msg_levels[MSGT_MAX];
-int mp_msg_level_all = MSGL_STATUS;
-int verbose = 0;
-
 int main(void)
 {
 	codecs_t *c;
         int i,j, nr_codecs, state;
 
-	mp_msg_init();
-
 	if (!(parse_codec_cfg("etc/codecs.conf")))
 		return 0;
 	if (!video_codecs)

Index: mp_msg.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp_msg.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mp_msg.c	6 Dec 2005 08:47:32 -0000	1.30
+++ mp_msg.c	7 Dec 2005 05:12:07 -0000	1.31
@@ -20,9 +20,9 @@
 /* maximum message length of mp_msg */
 #define MSGSIZE_MAX 3072
 
-extern int mp_msg_levels[MSGT_MAX]; // verbose level of this module
-extern int mp_msg_level_all;
-extern int verbose;
+int mp_msg_levels[MSGT_MAX]; // verbose level of this module. inited to 2
+int mp_msg_level_all = MSGL_STATUS;
+int verbose = 0;
 
 void mp_msg_init(){
     int i;

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.893
retrieving revision 1.894
diff -u -r1.893 -r1.894
--- mplayer.c	6 Dec 2005 08:52:17 -0000	1.893
+++ mplayer.c	7 Dec 2005 05:12:07 -0000	1.894
@@ -86,7 +86,7 @@
 
 int slave_mode=0;
 int player_idle_mode=0;
-int verbose=0;
+extern int verbose;
 int identify=0;
 int quiet=0;
 
@@ -343,8 +343,8 @@
 int global_sub_indices[SUB_SOURCES];
 int global_sub_quiet_osd_hack = 0;
 
-int mp_msg_levels[MSGT_MAX]; // inited to -2
-int mp_msg_level_all = MSGL_STATUS;
+extern int mp_msg_levels[MSGT_MAX];
+extern int mp_msg_level_all;
 
 static stream_t* stream=NULL;
 static demuxer_t *demuxer=NULL;

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- mencoder.c	6 Dec 2005 08:42:47 -0000	1.323
+++ mencoder.c	7 Dec 2005 05:12:07 -0000	1.324
@@ -129,7 +129,7 @@
 //void skip_audio_frame(sh_audio_t *sh_audio){}
 //void resync_audio_stream(sh_audio_t *sh_audio){}
 
-int verbose=0; // must be global!
+extern int verbose; // must be global!
 int identify=0;
 int quiet=0;
 double video_time_usage=0;
@@ -140,8 +140,8 @@
 double cur_vout_time_usage=0;
 int benchmark=0;
 
-int mp_msg_levels[MSGT_MAX]; // inited to -2
-int mp_msg_level_all = MSGL_STATUS;
+extern int mp_msg_levels[MSGT_MAX];
+extern int mp_msg_level_all;
 
 #ifdef WIN32
 char * proc_priority=NULL;