diff options
| -rw-r--r-- | help/help_mp-en.h | 3 | ||||
| -rw-r--r-- | input/joystick.c | 2 | ||||
| -rw-r--r-- | input/lirc.c | 4 | ||||
| -rw-r--r-- | libao2/ao_alsa.c | 6 | ||||
| -rw-r--r-- | stream/http.c | 4 | ||||
| -rw-r--r-- | stream/stream_rtsp.c | 2 |
6 files changed, 10 insertions, 11 deletions
diff --git a/help/help_mp-en.h b/help/help_mp-en.h index aba94763a4..c6f8b68a4b 100644 --- a/help/help_mp-en.h +++ b/help/help_mp-en.h @@ -650,8 +650,7 @@ static char help_text[]= // 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 diff --git a/input/joystick.c b/input/joystick.c index cd77dd42d5..c432bf7cf4 100644 --- a/input/joystick.c +++ b/input/joystick.c @@ -36,7 +36,7 @@ int mp_input_joystick_init(char* dev) { 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) { diff --git a/input/lirc.c b/input/lirc.c index 9694e64367..92d64833d6 100644 --- a/input/lirc.c +++ b/input/lirc.c @@ -23,9 +23,9 @@ int 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; } diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c index 3da9655857..7ba22e92cc 100644 --- a/libao2/ao_alsa.c +++ b/libao2/ao_alsa.c @@ -450,7 +450,7 @@ static int init(int rate_hz, int channels, int format, int flags) 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 @@ static int init(int rate_hz, int channels, int format, int flags) } /* 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 @@ static void uninit(int immed) } 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 { diff --git a/stream/http.c b/stream/http.c index 5634356991..013c6491d9 100644 --- a/stream/http.c +++ b/stream/http.c @@ -891,7 +891,7 @@ static int open_s1(stream_t *stream,int mode, void* opts, int* file_format) { 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 @@ static int open_s2(stream_t *stream,int mode, void* opts, int* file_format) { 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); diff --git a/stream/stream_rtsp.c b/stream/stream_rtsp.c index ba2a440f5a..07e09e1afc 100644 --- a/stream/stream_rtsp.c +++ b/stream/stream_rtsp.c @@ -140,7 +140,7 @@ rtsp_streaming_open (stream_t *stream, int mode, void *opts, int *file_format) 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; |