summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-11-15 09:09:29 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-11-15 09:09:29 +0000
commit3ebf6f0135d695289a0038ca0e46a8420e90b330 (patch)
treee57c72ba23b51a569a2df301d372d3726ff5b7a1
parentccc9c05e290349ed29bd44b9d5c37887ab85e7b3 (diff)
downloadmpv-3ebf6f0135d695289a0038ca0e46a8420e90b330.tar.bz2
mpv-3ebf6f0135d695289a0038ca0e46a8420e90b330.tar.xz
Reduce excessive verbosity.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13947 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--codec-cfg.c4
-rw-r--r--input/input.c6
-rw-r--r--libmpdemux/demuxer.c6
-rw-r--r--libvo/vo_xmga.c2
-rw-r--r--libvo/vo_xover.c2
-rw-r--r--libvo/vo_xvidix.c2
-rw-r--r--libvo/x11_common.c5
-rw-r--r--mencoder.c4
-rw-r--r--mp3lib/sr1.c2
-rw-r--r--mplayer.c9
-rw-r--r--parser-cfg.c4
11 files changed, 23 insertions, 23 deletions
diff --git a/codec-cfg.c b/codec-cfg.c
index e53d17bca5..90a5ad2c55 100644
--- a/codec-cfg.c
+++ b/codec-cfg.c
@@ -503,10 +503,10 @@ int parse_codec_cfg(char *cfgfile)
#endif
}
- mp_msg(MSGT_CODECCFG,MSGL_INFO,MSGTR_ReadingFile, cfgfile);
+ mp_msg(MSGT_CODECCFG,MSGL_V,MSGTR_ReadingFile, cfgfile);
if ((fp = fopen(cfgfile, "r")) == NULL) {
- mp_msg(MSGT_CODECCFG,MSGL_ERR,MSGTR_CantOpenFileError, cfgfile, strerror(errno));
+ mp_msg(MSGT_CODECCFG,MSGL_V,MSGTR_CantOpenFileError, cfgfile, strerror(errno));
return 0;
}
diff --git a/input/input.c b/input/input.c
index b26dd57c33..2b2fe5007c 100644
--- a/input/input.c
+++ b/input/input.c
@@ -1352,7 +1352,7 @@ mp_input_parse_config(char *file) {
fd = open(file,O_RDONLY);
if(fd < 0) {
- mp_msg(MSGT_INPUT,MSGL_ERR,"Can't open input config file %s: %s\n",file,strerror(errno));
+ mp_msg(MSGT_INPUT,MSGL_V,"Can't open input config file %s: %s\n",file,strerror(errno));
return 0;
}
@@ -1378,7 +1378,7 @@ mp_input_parse_config(char *file) {
}
// Empty buffer : return
if(bs <= 1) {
- mp_msg(MSGT_INPUT,MSGL_INFO,"Input config file %s parsed: %d binds\n",file,n_binds);
+ mp_msg(MSGT_INPUT,MSGL_V,"Input config file %s parsed: %d binds\n",file,n_binds);
if(binds)
cmd_binds = binds;
close(fd);
@@ -1519,7 +1519,7 @@ mp_input_init(void) {
// Try global conf dir
file = MPLAYER_CONFDIR "/input.conf";
if(! mp_input_parse_config(file))
- mp_msg(MSGT_INPUT,MSGL_WARN,"Falling back on default (hardcoded) input config\n");
+ mp_msg(MSGT_INPUT,MSGL_V,"Falling back on default (hardcoded) input config\n");
}
else
{
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 17377dffb8..2f80ba4055 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -94,7 +94,7 @@ sh_audio_t* new_sh_audio(demuxer_t *demuxer,int id){
}
void free_sh_audio(sh_audio_t* sh){
- mp_msg(MSGT_DEMUXER,MSGL_V,"DEMUXER: freeing sh_audio at %p \n",sh);
+ mp_msg(MSGT_DEMUXER,MSGL_DBG2,"DEMUXER: freeing sh_audio at %p\n",sh);
if(sh->wf) free(sh->wf);
free(sh);
}
@@ -117,7 +117,7 @@ sh_video_t* new_sh_video(demuxer_t *demuxer,int id){
}
void free_sh_video(sh_video_t* sh){
- mp_msg(MSGT_DEMUXER,MSGL_V,"DEMUXER: freeing sh_video at %p \n",sh);
+ mp_msg(MSGT_DEMUXER,MSGL_DBG2,"DEMUXER: freeing sh_video at %p\n",sh);
if(sh->bih) free(sh->bih);
free(sh);
}
@@ -164,7 +164,7 @@ extern void demux_close_tv(demuxer_t *demuxer);
void free_demuxer(demuxer_t *demuxer){
int i;
- mp_msg(MSGT_DEMUXER,MSGL_V,"DEMUXER: freeing demuxer at %p \n",demuxer);
+ mp_msg(MSGT_DEMUXER,MSGL_DBG2,"DEMUXER: freeing demuxer at %p\n",demuxer);
switch(demuxer->type) {
case DEMUXER_TYPE_PVA:
demux_close_pva(demuxer); break;
diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c
index 6253936436..008e5a424c 100644
--- a/libvo/vo_xmga.c
+++ b/libvo/vo_xmga.c
@@ -165,7 +165,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
vo_depthonscreen);
return -1;
}
- mp_msg(MSGT_VO, MSGL_INFO, "Using colorkey: %x\n", colorkey);
+ mp_msg(MSGT_VO, MSGL_V, "Using colorkey: %x\n", colorkey);
inited = 1;
diff --git a/libvo/vo_xover.c b/libvo/vo_xover.c
index 7f6e4c44f8..a5c2bea6bd 100644
--- a/libvo/vo_xover.c
+++ b/libvo/vo_xover.c
@@ -256,7 +256,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
mp_msg(MSGT_VO, MSGL_ERR, "Sorry, this (%d) color depth is not supported\n",
vo_depthonscreen);
}
- mp_msg(MSGT_VO, MSGL_INFO, "Using colorkey: %x\n", colorkey);
+ mp_msg(MSGT_VO, MSGL_V, "Using colorkey: %x\n", colorkey);
aspect(&d_width, &d_height, A_NOZOOM);
diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c
index 7589f19423..34480cb1de 100644
--- a/libvo/vo_xvidix.c
+++ b/libvo/vo_xvidix.c
@@ -286,7 +286,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
"Sorry, this (%d) color depth is not supported\n",
vo_depthonscreen);
}
- mp_msg(MSGT_VO, MSGL_INFO, "Using colorkey: %x\n", colorkey);
+ mp_msg(MSGT_VO, MSGL_V, "Using colorkey: %x\n", colorkey);
aspect(&d_width, &d_height, A_NOZOOM);
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 519d08d787..4399b8d3c6 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -230,6 +230,7 @@ void fstype_help(void)
"use _NETWM_STATE_STAYS_ON_TOP hint if available");
mp_msg(MSGT_VO, MSGL_INFO,
"You can also negate the settings with simply putting '-' in the beginning");
+ mp_msg(MSGT_VO, MSGL_INFO, "\n\n");
}
static void fstype_dump(int fstype)
@@ -1646,7 +1647,7 @@ void saver_on(Display * mDisplay)
DPMSInfo(mDisplay, &state, &onoff);
if (onoff)
{
- mp_msg(MSGT_VO, MSGL_INFO,
+ mp_msg(MSGT_VO, MSGL_V,
"Successfully enabled DPMS\n");
} else
{
@@ -1701,7 +1702,7 @@ void saver_off(Display * mDisplay)
{
Status stat;
- mp_msg(MSGT_VO, MSGL_INFO, "Disabling DPMS\n");
+ mp_msg(MSGT_VO, MSGL_V, "Disabling DPMS\n");
dpms_disabled = 1;
stat = DPMSDisable(mDisplay); // monitor powersave off
mp_msg(MSGT_VO, MSGL_V, "DPMSDisable stat: %d\n", stat);
diff --git a/mencoder.c b/mencoder.c
index d1cde38f53..c87938a3fb 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -390,7 +390,7 @@ unsigned int timer_start;
mp_msg_init();
mp_msg_set_level(MSGL_STATUS);
- mp_msg(MSGT_CPLAYER,MSGL_INFO, "MEncoder " VERSION " (C) 2000-2004 MPlayer Team\n\n");
+ mp_msg(MSGT_CPLAYER,MSGL_INFO, "MEncoder " VERSION " (C) 2000-2004 MPlayer Team\n");
/* Test for cpu capabilities (and corresponding OS support) for optimizing */
GetCpuCaps(&gCpuCaps);
@@ -435,7 +435,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){
mp_msg(MSGT_MENCODER,MSGL_HINT,MSGTR_CopyCodecsConf);
mencoder_exit(1,NULL);
}
- mp_msg(MSGT_MENCODER,MSGL_INFO,MSGTR_BuiltinCodecsConf);
+ mp_msg(MSGT_MENCODER,MSGL_V,MSGTR_BuiltinCodecsConf);
}
}
}
diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c
index 760c680294..0e8022e357 100644
--- a/mp3lib/sr1.c
+++ b/mp3lib/sr1.c
@@ -462,7 +462,7 @@ void MP3_Init(){
init_layer2();
init_layer3(fr.down_sample_sblimit);
- mp_msg(MSGT_DECAUDIO,MSGL_INFO,"MP3lib: init layer2&3 finished, tables done\n");
+ mp_msg(MSGT_DECAUDIO,MSGL_V,"MP3lib: init layer2&3 finished, tables done\n");
}
#if 0
diff --git a/mplayer.c b/mplayer.c
index 8b91bcd2f6..2d947f56b6 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -973,7 +973,7 @@ int gui_no_filename=0;
mp_msg_init();
mp_msg_set_level(MSGL_STATUS);
- mp_msg(MSGT_CPLAYER,MSGL_INFO, "MPlayer " VERSION " (C) 2000-2004 MPlayer Team\n\n");
+ mp_msg(MSGT_CPLAYER,MSGL_INFO, "MPlayer " VERSION " (C) 2000-2004 MPlayer Team\n");
/* Test for cpu capabilities (and corresponding OS support) for optimizing */
GetCpuCaps(&gCpuCaps);
#ifdef ARCH_X86
@@ -1119,7 +1119,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){
mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf);
exit_player_with_rc(NULL, 0);
}
- mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_BuiltinCodecsConf);
+ mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_BuiltinCodecsConf);
}
}
free( mem_ptr ); // release the buffer created by get_path()
@@ -1275,7 +1275,7 @@ if (edl_check_mode() == EDL_ERROR && edl_filename)
close (rtc_fd);
rtc_fd = -1;
} else
- mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_UsingRTCTiming, irqp);
+ mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_UsingRTCTiming, irqp);
}
}
#ifdef HAVE_NEW_GUI
@@ -1285,7 +1285,7 @@ if (edl_check_mode() == EDL_ERROR && edl_filename)
#endif
if(rtc_fd<0)
#endif
- mp_msg(MSGT_CPLAYER, MSGL_INFO, "Using %s timing\n",
+ mp_msg(MSGT_CPLAYER, MSGL_V, "Using %s timing\n",
softsleep?"software":timer_name);
#ifdef USE_TERMCAP
@@ -1439,7 +1439,6 @@ if(!noconsolecontrols && !slave_mode){
#endif
//---------------------------------------------------------------------------
- mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n");
if(filename) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Playing, filename);
//==================== Open VOB-Sub ============================
diff --git a/parser-cfg.c b/parser-cfg.c
index b7a9f8022a..587a348e3c 100644
--- a/parser-cfg.c
+++ b/parser-cfg.c
@@ -42,7 +42,7 @@ int m_config_parse_config_file(m_config_t* config, char *conffile)
assert(config != NULL);
// assert(conf_list != NULL);
#endif
- mp_msg(MSGT_CFGPARSER,MSGL_INFO,"Reading config file %s", conffile);
+ mp_msg(MSGT_CFGPARSER,MSGL_V,"Reading config file %s", conffile);
if (recursion_depth > MAX_RECURSION_DEPTH) {
mp_msg(MSGT_CFGPARSER,MSGL_ERR,": too deep 'include'. check your configfiles\n");
@@ -59,7 +59,7 @@ int m_config_parse_config_file(m_config_t* config, char *conffile)
}
if ((fp = fopen(conffile, "r")) == NULL) {
- mp_msg(MSGT_CFGPARSER,MSGL_ERR,": %s\n", strerror(errno));
+ mp_msg(MSGT_CFGPARSER,MSGL_V,": %s\n", strerror(errno));
free(line);
ret = 0;
goto out;