Mercurial > mplayer.hg
changeset 17120:637a2f4ff216
Some more cola for msglevel, codec-cfg can't even call mp_msg_init or it'll
print bogus stuff.
| author | ods15 |
|---|---|
| date | Wed, 07 Dec 2005 05:12:07 +0000 |
| parents | f6aa78b1a49c |
| children | 119790c08d5c |
| files | codec-cfg.c mencoder.c mp_msg.c mplayer.c |
| diffstat | 4 files changed, 9 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/codec-cfg.c Wed Dec 07 00:57:32 2005 +0000 +++ b/codec-cfg.c Wed Dec 07 05:12:07 2005 +0000 @@ -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)
--- a/mencoder.c Wed Dec 07 00:57:32 2005 +0000 +++ b/mencoder.c Wed Dec 07 05:12:07 2005 +0000 @@ -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;
--- a/mp_msg.c Wed Dec 07 00:57:32 2005 +0000 +++ b/mp_msg.c Wed Dec 07 05:12:07 2005 +0000 @@ -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;
--- a/mplayer.c Wed Dec 07 00:57:32 2005 +0000 +++ b/mplayer.c Wed Dec 07 05:12:07 2005 +0000 @@ -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;