Mercurial > mplayer.hg

changeset 13946:e632b43f0598

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reduce excessive verbosity.
author diego
date Mon, 15 Nov 2004 09:09:29 +0000
parents c917b3ff0b27
children c2e7b559f7a1
files codec-cfg.c input/input.c libmpdemux/demuxer.c libvo/vo_xmga.c libvo/vo_xover.c libvo/vo_xvidix.c libvo/x11_common.c mencoder.c mp3lib/sr1.c mplayer.c parser-cfg.c
diffstat 11 files changed, 23 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/codec-cfg.c	Sun Nov 14 22:25:49 2004 +0000
+++ b/codec-cfg.c	Mon Nov 15 09:09:29 2004 +0000
@@ -503,10 +503,10 @@
 #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;
 	}
 
--- a/input/input.c	Sun Nov 14 22:25:49 2004 +0000
+++ b/input/input.c	Mon Nov 15 09:09:29 2004 +0000
@@ -1352,7 +1352,7 @@
   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 @@
     }
     // 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 @@
     // 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
   {
--- a/libmpdemux/demuxer.c	Sun Nov 14 22:25:49 2004 +0000
+++ b/libmpdemux/demuxer.c	Mon Nov 15 09:09:29 2004 +0000
@@ -94,7 +94,7 @@
 }
 
 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 @@
 }
 
 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 @@
 
 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;
--- a/libvo/vo_xmga.c	Sun Nov 14 22:25:49 2004 +0000
+++ b/libvo/vo_xmga.c	Mon Nov 15 09:09:29 2004 +0000
@@ -165,7 +165,7 @@
                    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;
 
--- a/libvo/vo_xover.c	Sun Nov 14 22:25:49 2004 +0000
+++ b/libvo/vo_xover.c	Mon Nov 15 09:09:29 2004 +0000
@@ -256,7 +256,7 @@
       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);
 
--- a/libvo/vo_xvidix.c	Sun Nov 14 22:25:49 2004 +0000
+++ b/libvo/vo_xvidix.c	Mon Nov 15 09:09:29 2004 +0000
@@ -286,7 +286,7 @@
                    "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);
 
--- a/libvo/x11_common.c	Sun Nov 14 22:25:49 2004 +0000
+++ b/libvo/x11_common.c	Mon Nov 15 09:09:29 2004 +0000
@@ -230,6 +230,7 @@
            "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 @@
                 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 @@
         {
             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);
--- a/mencoder.c	Sun Nov 14 22:25:49 2004 +0000
+++ b/mencoder.c	Mon Nov 15 09:09:29 2004 +0000
@@ -390,7 +390,7 @@
 
   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 @@
 	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);
     }
   }
 }
--- a/mp3lib/sr1.c	Sun Nov 14 22:25:49 2004 +0000
+++ b/mp3lib/sr1.c	Mon Nov 15 09:09:29 2004 +0000
@@ -462,7 +462,7 @@
 
     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
--- a/mplayer.c	Sun Nov 14 22:25:49 2004 +0000
+++ b/mplayer.c	Mon Nov 15 09:09:29 2004 +0000
@@ -973,7 +973,7 @@
   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 @@
 	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 @@
     	    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 @@
 #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 @@
 #endif
 //---------------------------------------------------------------------------
 
-    mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n");
     if(filename) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Playing, filename);
 
 //==================== Open VOB-Sub ============================
--- a/parser-cfg.c	Sun Nov 14 22:25:49 2004 +0000
+++ b/parser-cfg.c	Mon Nov 15 09:09:29 2004 +0000
@@ -42,7 +42,7 @@
 	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 @@
 	}
 
 	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;