[MPlayer-cvslog] r20191 - in trunk: help/help_mp-en.h input/joystick.c input/lirc.c libao2/ao_alsa.c stream/http.c stream/stream_rtsp.c

[diego]

Author: diego
Date: Fri Oct 13 00:24:19 2006
New Revision: 20191

Modified:
   trunk/help/help_mp-en.h
   trunk/input/joystick.c
   trunk/input/lirc.c
   trunk/libao2/ao_alsa.c
   trunk/stream/http.c
   trunk/stream/stream_rtsp.c

Log:
slight overall verbosity reduction


Modified: trunk/help/help_mp-en.h
==============================================================================
--- trunk/help/help_mp-en.h	(original)
+++ trunk/help/help_mp-en.h	Fri Oct 13 00:24:19 2006
@@ -650,8 +650,7 @@
 
 // LIRC:
 #define MSGTR_SettingUpLIRC "Setting up LIRC support...\n"
-#define MSGTR_LIRCdisabled "You will not be able to use your remote control.\n"
-#define MSGTR_LIRCopenfailed "Failed to open LIRC support.\n"
+#define MSGTR_LIRCopenfailed "Failed to open LIRC support. You will not be able to use your remote control.\n"
 #define MSGTR_LIRCcfgerr "Failed to read LIRC config file %s.\n"
 
 // vf.c

Modified: trunk/input/joystick.c
==============================================================================
--- trunk/input/joystick.c	(original)
+++ trunk/input/joystick.c	Fri Oct 13 00:24:19 2006
@@ -36,7 +36,7 @@
   int inited = 0;
   struct js_event ev;
   
-  mp_msg(MSGT_INPUT,MSGL_INFO,MSGTR_INPUT_JOYSTICK_Opening,dev ? dev : JS_DEV);
+  mp_msg(MSGT_INPUT,MSGL_V,MSGTR_INPUT_JOYSTICK_Opening,dev ? dev : JS_DEV);
 
   fd = open( dev ? dev : JS_DEV , O_RDONLY | O_NONBLOCK );
   if(fd < 0) {

Modified: trunk/input/lirc.c
==============================================================================
--- trunk/input/lirc.c	(original)
+++ trunk/input/lirc.c	Fri Oct 13 00:24:19 2006
@@ -23,9 +23,9 @@
 mp_input_lirc_init(void) {
   int lirc_sock;
 
-  mp_msg(MSGT_LIRC,MSGL_INFO,MSGTR_SettingUpLIRC);
+  mp_msg(MSGT_LIRC,MSGL_V,MSGTR_SettingUpLIRC);
   if((lirc_sock=lirc_init("mplayer",1))==-1){
-    mp_msg(MSGT_LIRC,MSGL_ERR,MSGTR_LIRCopenfailed MSGTR_LIRCdisabled);
+    mp_msg(MSGT_LIRC,MSGL_ERR,MSGTR_LIRCopenfailed);
     return -1;
   }
 

Modified: trunk/libao2/ao_alsa.c
==============================================================================
--- trunk/libao2/ao_alsa.c	(original)
+++ trunk/libao2/ao_alsa.c	Fri Oct 13 00:24:19 2006
@@ -450,7 +450,7 @@
     ao_noblock = !block;
     parse_device(alsa_device, device.str, device.len);
 
-    mp_msg(MSGT_AO,MSGL_INFO,"alsa-init: using device %s\n", alsa_device);
+    mp_msg(MSGT_AO,MSGL_V,"alsa-init: using device %s\n", alsa_device);
 
     //setting modes for block or nonblock-mode
     if (ao_noblock) {
@@ -723,7 +723,7 @@
       }
       /* end setting sw-params */
 
-      mp_msg(MSGT_AO,MSGL_INFO,"alsa: %d Hz/%d channels/%d bpf/%d bytes buffer/%s\n",
+      mp_msg(MSGT_AO,MSGL_V,"alsa: %d Hz/%d channels/%d bpf/%d bytes buffer/%s\n",
 	     ao_data.samplerate, ao_data.channels, bytes_per_sample, ao_data.buffersize,
 	     snd_pcm_format_description(alsa_format));
 
@@ -750,7 +750,7 @@
       }
     else {
       alsa_handler = NULL;
-      mp_msg(MSGT_AO,MSGL_INFO,"alsa-uninit: pcm closed\n");
+      mp_msg(MSGT_AO,MSGL_V,"alsa-uninit: pcm closed\n");
     }
   }
   else {

Modified: trunk/stream/http.c
==============================================================================
--- trunk/stream/http.c	(original)
+++ trunk/stream/http.c	Fri Oct 13 00:24:19 2006
@@ -891,7 +891,7 @@
 	stream->streaming_ctrl->url = check4proxies(url);
 	url_free(url);
 	
-	mp_msg(MSGT_OPEN, MSGL_INFO, "STREAM_HTTP(1), URL: %s\n", stream->url);
+	mp_msg(MSGT_OPEN, MSGL_V, "STREAM_HTTP(1), URL: %s\n", stream->url);
 	seekable = http_streaming_start(stream, file_format);
 	if((seekable < 0) || (*file_format == DEMUXER_TYPE_ASF)) {
 		streaming_ctrl_free(stream->streaming_ctrl);
@@ -915,7 +915,7 @@
 	stream->streaming_ctrl->url = check4proxies(url);
 	url_free(url);
 	
-	mp_msg(MSGT_OPEN, MSGL_INFO, "STREAM_HTTP(2), URL: %s\n", stream->url);
+	mp_msg(MSGT_OPEN, MSGL_V, "STREAM_HTTP(2), URL: %s\n", stream->url);
 	seekable = http_streaming_start(stream, file_format);
 	if(seekable < 0) {
 		streaming_ctrl_free(stream->streaming_ctrl);

Modified: trunk/stream/stream_rtsp.c
==============================================================================
--- trunk/stream/stream_rtsp.c	(original)
+++ trunk/stream/stream_rtsp.c	Fri Oct 13 00:24:19 2006
@@ -140,7 +140,7 @@
   URL_t *url;
   extern int index_mode;
   
-  mp_msg (MSGT_OPEN, MSGL_INFO, "STREAM_RTSP, URL: %s\n", stream->url);
+  mp_msg (MSGT_OPEN, MSGL_V, "STREAM_RTSP, URL: %s\n", stream->url);
   stream->streaming_ctrl = streaming_ctrl_new ();
   if (!stream->streaming_ctrl)
     return STREAM_ERROR;