[MPlayer-cvslog] r31458 - in trunk: cfg-common.h mp_msg.h

[diego]

Author: diego
Date: Fri Jun 18 11:41:53 2010
New Revision: 31458

Log:
Move mp_msg-related extern variable declarations to mp_msg.h.

Modified:
   trunk/cfg-common.h
   trunk/mp_msg.h

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Thu Jun 17 12:42:45 2010	(r31457)
+++ trunk/cfg-common.h	Fri Jun 18 11:41:53 2010	(r31458)
@@ -23,16 +23,13 @@
 #include "config.h"
 #include "m_config.h"
 #include "m_option.h"
+#include "mp_msg.h"
 
 #include "libmpcodecs/ad.h"
 #include "libmpcodecs/vd.h"
 #include "libmpdemux/demux_ts.h"
 #include "osdep/priority.h"
 
-extern char *mp_msg_charset;
-extern int mp_msg_color;
-extern int mp_msg_module;
-
 /* defined in codec-cfg.c */
 extern char * codecs_file;
 
@@ -267,9 +264,6 @@ const m_option_t audio_filter_conf[]={
     {NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
-extern int mp_msg_levels[MSGT_MAX];
-extern int mp_msg_level_all;
-
 const m_option_t msgl_config[]={
     { "all", &mp_msg_level_all, CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL},
 

Modified: trunk/mp_msg.h
==============================================================================
--- trunk/mp_msg.h	Thu Jun 17 12:42:45 2010	(r31457)
+++ trunk/mp_msg.h	Fri Jun 18 11:41:53 2010	(r31458)
@@ -126,6 +126,15 @@ extern int verbose;
 
 #define MSGT_MAX 64
 
+
+extern char *mp_msg_charset;
+extern int mp_msg_color;
+extern int mp_msg_module;
+
+extern int mp_msg_levels[MSGT_MAX];
+extern int mp_msg_level_all;
+
+
 void mp_msg_init(void);
 int mp_msg_test(int mod, int lev);