[MPlayer-cvslog] r33915 - in trunk: codec-cfg.c help/help_mp-bg.h help/help_mp-cs.h help/help_mp-de.h help/help_mp-dk.h help/help_mp-el.h help/help_mp-en.h help/help_mp-es.h help/help_mp-fr.h help/help_mp-hu.h help...
diego
subversion at mplayerhq.hu
Mon Jul 25 01:55:34 CEST 2011
Author: diego
Date: Mon Jul 25 01:55:34 2011
New Revision: 33915
Log:
Do not translate console messages of verbosity level MSGL_V and above.
Modified:
trunk/codec-cfg.c
trunk/input/appleir.c
trunk/input/joystick.c
trunk/input/lirc.c
trunk/libao2/audio_out.c
trunk/libmpcodecs/ae_lame.c
trunk/libmpcodecs/dec_audio.c
trunk/libmpcodecs/dec_video.c
trunk/libmpcodecs/vd_dmo.c
trunk/libmpcodecs/vd_dshow.c
trunk/libmpdemux/aviheader.c
trunk/libmpdemux/demux_asf.c
trunk/libmpdemux/demux_mpg.c
trunk/libmpdemux/demuxer.c
trunk/libmpdemux/muxer.c
trunk/mpcommon.c
trunk/mplayer.c
trunk/stream/ai_alsa.c
trunk/stream/ai_alsa1x.c
trunk/stream/stream_bluray.c
trunk/stream/stream_radio.c
trunk/stream/tv.c
trunk/stream/tvi_dshow.c
Changes in other areas also in this revision:
Modified:
trunk/help/help_mp-bg.h
trunk/help/help_mp-cs.h
trunk/help/help_mp-de.h
trunk/help/help_mp-dk.h
trunk/help/help_mp-el.h
trunk/help/help_mp-en.h
trunk/help/help_mp-es.h
trunk/help/help_mp-fr.h
trunk/help/help_mp-hu.h
trunk/help/help_mp-it.h
trunk/help/help_mp-ja.h
trunk/help/help_mp-ko.h
trunk/help/help_mp-mk.h
trunk/help/help_mp-nb.h
trunk/help/help_mp-nl.h
trunk/help/help_mp-pl.h
trunk/help/help_mp-pt_BR.h
trunk/help/help_mp-ro.h
trunk/help/help_mp-ru.h
trunk/help/help_mp-sk.h
trunk/help/help_mp-sv.h
trunk/help/help_mp-tr.h
trunk/help/help_mp-uk.h
trunk/help/help_mp-zh_CN.h
trunk/help/help_mp-zh_TW.h
Modified: trunk/codec-cfg.c
==============================================================================
--- trunk/codec-cfg.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/codec-cfg.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -555,7 +555,7 @@ int parse_codec_cfg(const char *cfgfile)
#endif
}
- mp_msg(MSGT_CODECCFG,MSGL_V,MSGTR_ReadingFile, cfgfile);
+ mp_msg(MSGT_CODECCFG, MSGL_V, "Reading %s: ", cfgfile);
if ((fp = fopen(cfgfile, "r")) == NULL) {
mp_msg(MSGT_CODECCFG,MSGL_V,MSGTR_CantOpenFileError, cfgfile, strerror(errno));
Modified: trunk/input/appleir.c
==============================================================================
--- trunk/input/appleir.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/input/appleir.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -79,7 +79,7 @@ int mp_input_appleir_init (char *dev)
if (dev)
{
- mp_msg (MSGT_INPUT, MSGL_V, MSGTR_INPUT_APPLE_IR_Init, dev);
+ mp_msg (MSGT_INPUT, MSGL_V, "Initializing Apple IR on %s\n", dev);
fd = open (dev, O_RDONLY | O_NONBLOCK);
if (fd < 0)
{
@@ -108,7 +108,7 @@ int mp_input_appleir_init (char *dev)
id.vendor == USB_VENDOR_APPLE &&
(id.product == USB_DEV_APPLE_IR ||id.product == USB_DEV_APPLE_IR_2))
{
- mp_msg (MSGT_INPUT, MSGL_V, MSGTR_INPUT_APPLE_IR_Detect, file);
+ mp_msg (MSGT_INPUT, MSGL_V, "Detected Apple IR on %s\n", file);
return fd;
}
close (fd);
Modified: trunk/input/joystick.c
==============================================================================
--- trunk/input/joystick.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/input/joystick.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -51,7 +51,7 @@ int mp_input_joystick_init(char* dev) {
int initialized = 0;
struct js_event ev;
- mp_msg(MSGT_INPUT,MSGL_V,MSGTR_INPUT_JOYSTICK_Opening,dev ? dev : JS_DEV);
+ mp_msg(MSGT_INPUT, MSGL_V, "Opening joystick device %s\n", 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 Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/input/lirc.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -41,7 +41,7 @@ mp_input_lirc_init(void) {
int lirc_sock;
int mode;
- mp_msg(MSGT_LIRC,MSGL_V,MSGTR_SettingUpLIRC);
+ mp_msg(MSGT_LIRC, MSGL_V, "Setting up LIRC support...\n");
if((lirc_sock=lirc_init("mplayer",1))==-1){
mp_msg(MSGT_LIRC,MSGL_ERR,MSGTR_LIRCopenfailed);
return -1;
Modified: trunk/libao2/audio_out.c
==============================================================================
--- trunk/libao2/audio_out.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/libao2/audio_out.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -159,7 +159,7 @@ const ao_functions_t* init_best_audio_ou
else
ao_len = strlen(ao);
- mp_msg(MSGT_AO, MSGL_V, MSGTR_AO_TryingPreferredAudioDriver,
+ mp_msg(MSGT_AO, MSGL_V, "Trying preferred audio driver '%.*s', options '%s'\n",
ao_len, ao, ao_subdevice ? ao_subdevice : "[none]");
for(i=0;audio_out_drivers[i];i++){
@@ -182,7 +182,7 @@ const ao_functions_t* init_best_audio_ou
free(ao_subdevice);
ao_subdevice = NULL;
- mp_msg(MSGT_AO, MSGL_V, MSGTR_AO_TryingEveryKnown);
+ mp_msg(MSGT_AO, MSGL_V, "Trying every known audio driver...\n");
// now try the rest...
for(i=0;audio_out_drivers[i];i++){
Modified: trunk/libmpcodecs/ae_lame.c
==============================================================================
--- trunk/libmpcodecs/ae_lame.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/libmpcodecs/ae_lame.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -162,7 +162,7 @@ static void fixup(audio_encoder_t *encod
encoder->stream->h.dwRate=encoder->stream->wf->nAvgBytesPerSec;
encoder->stream->h.dwScale=1;
encoder->stream->wf->nBlockAlign=1;
- mp_msg(MSGT_MENCODER, MSGL_V, MSGTR_CBRAudioByterate,
+ mp_msg(MSGT_MENCODER, MSGL_V, "\n\nCBR audio: %d bytes/sec, %d bytes/block\n",
encoder->stream->h.dwRate,((MPEGLAYER3WAVEFORMAT*)(encoder->stream->wf))->nBlockSize);
}
}
@@ -193,14 +193,14 @@ int mpae_init_lame(audio_encoder_t *enco
if(lame_param_mode>=0) lame_set_mode(lame,lame_param_mode); // j-st
if(lame_param_ratio>0) lame_set_compression_ratio(lame,lame_param_ratio);
if(lame_param_scale>0) {
- mp_msg(MSGT_MENCODER, MSGL_V, MSGTR_SettingAudioInputGain, lame_param_scale);
+ mp_msg(MSGT_MENCODER, MSGL_V, "Setting audio input gain to %f.\n", lame_param_scale);
lame_set_scale(lame,lame_param_scale);
}
if(lame_param_lowpassfreq>=-1) lame_set_lowpassfreq(lame,lame_param_lowpassfreq);
if(lame_param_highpassfreq>=-1) lame_set_highpassfreq(lame,lame_param_highpassfreq);
#ifdef CONFIG_MP3LAME_PRESET
if(lame_param_preset != NULL) {
- mp_msg(MSGT_MENCODER, MSGL_V, MSGTR_LamePresetEquals,lame_param_preset);
+ mp_msg(MSGT_MENCODER, MSGL_V, "\npreset=%s\n\n", lame_param_preset);
if(lame_presets_set(lame,lame_param_fast, (lame_param_vbr==0), lame_param_preset) < 0)
return 0;
}
Modified: trunk/libmpcodecs/dec_audio.c
==============================================================================
--- trunk/libmpcodecs/dec_audio.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/libmpcodecs/dec_audio.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -86,7 +86,7 @@ static int init_audio_codec(sh_audio_t *
/* allocate audio in buffer: */
if (sh_audio->audio_in_minsize > 0) {
sh_audio->a_in_buffer_size = sh_audio->audio_in_minsize;
- mp_msg(MSGT_DECAUDIO, MSGL_V, MSGTR_AllocatingBytesForInputBuffer,
+ mp_msg(MSGT_DECAUDIO, MSGL_V, "dec_audio: Allocating %d bytes for input buffer.\n",
sh_audio->a_in_buffer_size);
sh_audio->a_in_buffer = av_mallocz(sh_audio->a_in_buffer_size);
sh_audio->a_in_buffer_len = 0;
@@ -94,7 +94,7 @@ static int init_audio_codec(sh_audio_t *
sh_audio->a_buffer_size = sh_audio->audio_out_minsize + MAX_OUTBURST;
- mp_msg(MSGT_DECAUDIO, MSGL_V, MSGTR_AllocatingBytesForOutputBuffer,
+ mp_msg(MSGT_DECAUDIO, MSGL_V, "dec_audio: Allocating %d + %d = %d bytes for output buffer.\n",
sh_audio->audio_out_minsize, MAX_OUTBURST, sh_audio->a_buffer_size);
sh_audio->a_buffer = av_mallocz(sh_audio->a_buffer_size);
@@ -305,7 +305,7 @@ void uninit_audio(sh_audio_t *sh_audio)
sh_audio->afilter = NULL;
}
if (sh_audio->initialized) {
- mp_msg(MSGT_DECAUDIO, MSGL_V, MSGTR_UninitAudioStr,
+ mp_msg(MSGT_DECAUDIO, MSGL_V, "Uninit audio: %s\n",
sh_audio->codec->drv);
sh_audio->ad_driver->uninit(sh_audio);
#ifdef CONFIG_DYNAMIC_PLUGINS
@@ -345,7 +345,8 @@ int init_audio_filters(sh_audio_t *sh_au
// filter config:
memcpy(&afs->cfg, &af_cfg, sizeof(af_cfg_t));
- mp_msg(MSGT_DECAUDIO, MSGL_V, MSGTR_BuildingAudioFilterChain,
+ mp_msg(MSGT_DECAUDIO, MSGL_V,
+ "Building audio filter chain for %dHz/%dch/%s -> %dHz/%dch/%s...\n",
afs->input.rate, afs->input.nch,
af_fmt2str_short(afs->input.format), afs->output.rate,
afs->output.nch, af_fmt2str_short(afs->output.format));
Modified: trunk/libmpcodecs/dec_video.c
==============================================================================
--- trunk/libmpcodecs/dec_video.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/libmpcodecs/dec_video.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -108,7 +108,8 @@ int set_video_colors(sh_video_t *sh_vide
if (mpvdec->control(sh_video, VDCTRL_SET_EQUALIZER, item,
(int *) value) == CONTROL_OK)
return 1;
- mp_msg(MSGT_DECVIDEO, MSGL_V, MSGTR_VideoAttributeNotSupportedByVO_VD,
+ mp_msg(MSGT_DECVIDEO, MSGL_V,
+ "Video attribute '%s' is not supported by selected vo & vd.\n",
item);
return 0;
}
@@ -174,7 +175,7 @@ void uninit_video(sh_video_t *sh_video)
{
if (!sh_video->initialized)
return;
- mp_msg(MSGT_DECVIDEO, MSGL_V, MSGTR_UninitVideoStr, sh_video->codec->drv);
+ mp_msg(MSGT_DECVIDEO, MSGL_V, "Uninit video: %s\n", sh_video->codec->drv);
mpvdec->uninit(sh_video);
mpvdec = NULL;
#ifdef CONFIG_DYNAMIC_PLUGINS
Modified: trunk/libmpcodecs/vd_dmo.c
==============================================================================
--- trunk/libmpcodecs/vd_dmo.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/libmpcodecs/vd_dmo.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -89,7 +89,7 @@ static int init(sh_video_t *sh){
DMO_VideoDecoder_SetDestFmt(ctx->decoder,out_fmt&255,0); // RGB/BGR
}
DMO_VideoDecoder_StartInternal(ctx->decoder);
- mp_msg(MSGT_DECVIDEO,MSGL_V,MSGTR_DMOInitOK);
+ mp_msg(MSGT_DECVIDEO, MSGL_V, "INFO: Win32/DMO video codec init OK.\n");
return 1;
}
Modified: trunk/libmpcodecs/vd_dshow.c
==============================================================================
--- trunk/libmpcodecs/vd_dshow.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/libmpcodecs/vd_dshow.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -99,7 +99,7 @@ static int init(sh_video_t *sh){
}
DS_SetAttr_DivX("Quality",divx_quality);
DS_VideoDecoder_StartInternal(sh->context);
- mp_msg(MSGT_DECVIDEO,MSGL_V,MSGTR_DShowInitOK);
+ mp_msg(MSGT_DECVIDEO, MSGL_V, "INFO: Win32/DShow video codec init OK.\n");
return 1;
}
Modified: trunk/libmpdemux/aviheader.c
==============================================================================
--- trunk/libmpdemux/aviheader.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/libmpdemux/aviheader.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -93,7 +93,8 @@ while(1){
// found MOVI header
if(!demuxer->movi_start) demuxer->movi_start=stream_tell(demuxer->stream);
demuxer->movi_end=stream_tell(demuxer->stream)+len;
- mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_FoundMovieAt,(int)demuxer->movi_start,(int)demuxer->movi_end);
+ mp_msg(MSGT_HEADER, MSGL_V, "Found movie at 0x%X - 0x%X\n",
+ (int)demuxer->movi_start, (int)demuxer->movi_end);
if(demuxer->stream->end_pos>demuxer->movi_end) demuxer->movi_end=demuxer->stream->end_pos;
if(index_mode==-2 || index_mode==2 || index_mode==0)
break; // reading from non-seekable source (stdin) or forced index or no index forced
@@ -268,7 +269,8 @@ while(1){
if(last_fccType==streamtypeVIDEO){
sh_video->bih=calloc(FFMAX(chunksize, sizeof(*sh_video->bih)), 1);
// sh_video->bih=malloc(chunksize); memset(sh_video->bih,0,chunksize);
- mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_FoundBitmapInfoHeader,chunksize,sizeof(*sh_video->bih));
+ mp_msg(MSGT_HEADER, MSGL_V, "Found 'bih', %u bytes of %d\n",
+ chunksize, sizeof(*sh_video->bih));
stream_read(demuxer->stream,(char*) sh_video->bih,chunksize);
le2me_BITMAPINFOHEADER(sh_video->bih); // swap to machine endian
if (sh_video->bih->biSize > chunksize && sh_video->bih->biSize > sizeof(*sh_video->bih))
@@ -289,7 +291,7 @@ while(1){
case mmioFOURCC('m', 'p', 'g', '4'):
case mmioFOURCC('D', 'I', 'V', '1'):
idxfix_divx=3; // set index recovery mpeg4 flavour: msmpeg4v1
- mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_RegeneratingKeyfTableForMPG4V1);
+ mp_msg(MSGT_HEADER, MSGL_V, "Regenerating keyframe table for M$ mpg4v1 video.\n");
break;
case mmioFOURCC('D', 'I', 'V', '3'):
case mmioFOURCC('d', 'i', 'v', '3'):
@@ -306,7 +308,7 @@ while(1){
case mmioFOURCC('D', 'I', 'V', '2'):
case mmioFOURCC('A', 'P', '4', '1'):
idxfix_divx=1; // set index recovery mpeg4 flavour: msmpeg4v3
- mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_RegeneratingKeyfTableForDIVX3);
+ mp_msg(MSGT_HEADER, MSGL_V, "Regenerating keyframe table for DIVX3 video.\n");
break;
case mmioFOURCC('D', 'I', 'V', 'X'):
case mmioFOURCC('d', 'i', 'v', 'x'):
@@ -316,7 +318,7 @@ while(1){
case mmioFOURCC('F', 'M', 'P', '4'):
case mmioFOURCC('f', 'm', 'p', '4'):
idxfix_divx=2; // set index recovery mpeg4 flavour: generic mpeg4
- mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_RegeneratingKeyfTableForMPEG4);
+ mp_msg(MSGT_HEADER, MSGL_V, "Regenerating keyframe table for MPEG-4 video.\n");
break;
}
} else
@@ -324,7 +326,8 @@ while(1){
unsigned wf_size = chunksize<sizeof(*sh_audio->wf)?sizeof(*sh_audio->wf):chunksize;
sh_audio->wf=calloc(wf_size,1);
// sh_audio->wf=malloc(chunksize); memset(sh_audio->wf,0,chunksize);
- mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_FoundWaveFmt,chunksize,sizeof(*sh_audio->wf));
+ mp_msg(MSGT_HEADER, MSGL_V, "Found 'wf', %d bytes of %d\n",
+ chunksize, sizeof(*sh_audio->wf));
stream_read(demuxer->stream,(char*) sh_audio->wf,chunksize);
le2me_WAVEFORMATEX(sh_audio->wf);
if (sh_audio->wf->cbSize != 0 &&
@@ -369,7 +372,8 @@ while(1){
case mmioFOURCC('d', 'm', 'l', 'h'): {
// dmlh 00 00 00 04 frms
unsigned int total_frames = stream_read_dword_le(demuxer->stream);
- mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_FoundAVIV2Header, chunksize, total_frames);
+ mp_msg(MSGT_HEADER, MSGL_V, "AVI: dmlh found (size=%d) (total_frames=%d)\n",
+ chunksize, total_frames);
stream_skip(demuxer->stream, chunksize-4);
chunksize = 0;
}
@@ -381,7 +385,8 @@ while(1){
int read;
int i;
priv->idx_size=size2>>4;
- mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_ReadingIndexBlockChunksForFrames,
+ mp_msg(MSGT_HEADER, MSGL_V,
+ "Reading INDEX block, %d chunks for %d frames (fpos=%"PRId64").\n",
priv->idx_size,avih.dwTotalFrames, (int64_t)stream_tell(demuxer->stream));
priv->idx=malloc(priv->idx_size<<4);
// printf("\nindex to %p !!!!! (priv=%p)\n",priv->idx,priv);
@@ -405,7 +410,7 @@ while(1){
case mmioFOURCC('R','I','F','F'): {
char riff_type[4];
- mp_msg(MSGT_HEADER, MSGL_V, MSGTR_MPDEMUX_AVIHDR_AdditionalRIFFHdr);
+ mp_msg(MSGT_HEADER, MSGL_V, "Additional RIFF header...\n");
stream_read(demuxer->stream, riff_type, sizeof riff_type);
if (strncmp(riff_type, "AVIX", sizeof riff_type))
mp_msg(MSGT_HEADER, MSGL_WARN, MSGTR_MPDEMUX_AVIHDR_WarnNotExtendedAVIHdr);
@@ -446,7 +451,7 @@ while(1){
if(list_end>0 &&
chunksize+stream_tell(demuxer->stream) == list_end) list_end=0;
if(list_end>0 && chunksize+stream_tell(demuxer->stream)>list_end){
- mp_msg(MSGT_HEADER,MSGL_V,MSGTR_MPDEMUX_AVIHDR_BrokenChunk,chunksize,(char *) &id);
+ mp_msg(MSGT_HEADER, MSGL_V, "Broken chunk? chunksize=%d (id=%.4s)\n", chunksize, (char *) &id);
stream_seek(demuxer->stream,list_end);
list_end=0;
} else
Modified: trunk/libmpdemux/demux_asf.c
==============================================================================
--- trunk/libmpdemux/demux_asf.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/libmpdemux/demux_asf.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -654,7 +654,8 @@ static demuxer_t* demux_open_asf(demuxer
}
if(demuxer->audio->id!=-2){
- mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_ASFSearchingForAudioStream,demuxer->audio->id);
+ mp_msg(MSGT_DEMUXER, MSGL_V,
+ "ASF: Searching for audio stream (id:%d).\n", demuxer->audio->id);
if(!ds_fill_buffer(demuxer->audio)){
mp_msg(MSGT_DEMUXER,MSGL_INFO,"ASF: " MSGTR_MissingAudioStream);
demuxer->audio->sh=NULL;
Modified: trunk/libmpdemux/demux_mpg.c
==============================================================================
--- trunk/libmpdemux/demux_mpg.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/libmpdemux/demux_mpg.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -730,7 +730,7 @@ static int demux_mpg_probe(demuxer_t *de
if(demuxer->synced==2)
mp_msg(MSGT_DEMUXER,MSGL_ERR,"MPEG: " MSGTR_MissingVideoStreamBug);
else
- mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_NotSystemStream);
+ mp_msg(MSGT_DEMUXER, MSGL_V, "Not MPEG System Stream format... (maybe Transport Stream?)\n");
}
}
//FIXME this shouldn't be necessary
Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/libmpdemux/demuxer.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -328,7 +328,7 @@ sh_audio_t *new_sh_audio_aid(demuxer_t *
mp_msg(MSGT_DEMUXER, MSGL_WARN, MSGTR_AudioStreamRedefined, id);
else {
sh_audio_t *sh = calloc(1, sizeof(sh_audio_t));
- mp_msg(MSGT_DEMUXER, MSGL_V, MSGTR_FoundAudioStream, id);
+ mp_msg(MSGT_DEMUXER, MSGL_V, "==> Found audio stream: %d\n", id);
demuxer->a_streams[id] = sh;
sh->aid = aid;
sh->ds = demuxer->audio;
@@ -376,7 +376,7 @@ sh_video_t *new_sh_video_vid(demuxer_t *
mp_msg(MSGT_DEMUXER, MSGL_WARN, MSGTR_VideoStreamRedefined, id);
else {
sh_video_t *sh = calloc(1, sizeof(sh_video_t));
- mp_msg(MSGT_DEMUXER, MSGL_V, MSGTR_FoundVideoStream, id);
+ mp_msg(MSGT_DEMUXER, MSGL_V, "==> Found video stream: %d\n", id);
demuxer->v_streams[id] = sh;
sh->vid = vid;
sh->ds = demuxer->video;
Modified: trunk/libmpdemux/muxer.c
==============================================================================
--- trunk/libmpdemux/muxer.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/libmpdemux/muxer.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -78,7 +78,7 @@ void muxer_flush(muxer_t *m) {
if (!m->muxbuf)
return;
- mp_msg(MSGT_MUXER, MSGL_V, MSGTR_MuxbufSending, m->muxbuf_num);
+ mp_msg(MSGT_MUXER, MSGL_V, "Muxer frame buffer sending %d frame(s) to the muxer.\n", m->muxbuf_num);
/* fix parameters for all streams */
for (num = 0; m->streams[num]; ++num) {
Modified: trunk/mpcommon.c
==============================================================================
--- trunk/mpcommon.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/mpcommon.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -77,9 +77,9 @@ void print_version(const char* name)
gCpuCaps.has3DNow, gCpuCaps.has3DNowExt,
gCpuCaps.hasSSE, gCpuCaps.hasSSE2, gCpuCaps.hasSSSE3);
#if CONFIG_RUNTIME_CPUDETECT
- mp_msg(MSGT_CPLAYER,MSGL_V, MSGTR_CompiledWithRuntimeDetection);
+ mp_msg(MSGT_CPLAYER, MSGL_V, "Compiled with runtime CPU detection.\n");
#else
- mp_msg(MSGT_CPLAYER,MSGL_V, MSGTR_CompiledWithCPUExtensions);
+ mp_msg(MSGT_CPLAYER, MSGL_V, "Compiled for x86 CPU with extensions:");
if (HAVE_MMX)
mp_msg(MSGT_CPLAYER,MSGL_V," MMX");
if (HAVE_MMX2)
@@ -478,7 +478,7 @@ int common_init(void)
free(conf_path);
return 0;
}
- mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_BuiltinCodecsConf);
+ mp_msg(MSGT_CPLAYER, MSGL_V, "Using built-in default codecs.conf.\n");
}
}
free(conf_path);
Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/mplayer.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -2935,7 +2935,7 @@ int main(int argc, char *argv[])
// Many users forget to include command line in bugreports...
if (mp_msg_test(MSGT_CPLAYER, MSGL_V)) {
- mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_CommandLine);
+ mp_msg(MSGT_CPLAYER, MSGL_INFO, "CommandLine:");
for (i = 1; i < argc; i++)
mp_msg(MSGT_CPLAYER, MSGL_INFO, " '%s'", argv[i]);
mp_msg(MSGT_CPLAYER, MSGL_INFO, "\n");
@@ -2963,7 +2963,7 @@ int main(int argc, char *argv[])
close(rtc_fd);
rtc_fd = -1;
} else
- mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_UsingRTCTiming, irqp);
+ mp_msg(MSGT_CPLAYER, MSGL_V, "Using Linux hardware RTC timing (%ldHz).\n", irqp);
}
}
#ifdef CONFIG_GUI
@@ -2998,16 +2998,16 @@ int main(int argc, char *argv[])
#ifdef CONFIG_MENU
if (use_menu) {
if (menu_cfg && menu_init(mpctx, menu_cfg))
- mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_MenuInitialized, menu_cfg);
+ mp_msg(MSGT_CPLAYER, MSGL_V, "Menu initialized: %s\n", menu_cfg);
else {
menu_cfg = get_path("menu.conf");
if (menu_init(mpctx, menu_cfg))
- mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_MenuInitialized, menu_cfg);
+ mp_msg(MSGT_CPLAYER, MSGL_V, "Menu initialized: %s\n", menu_cfg);
else {
if (menu_init(mpctx, MPLAYER_CONFDIR "/menu.conf"))
- mp_msg(MSGT_CPLAYER, MSGL_V, MSGTR_MenuInitialized, MPLAYER_CONFDIR "/menu.conf");
+ mp_msg(MSGT_CPLAYER, MSGL_V, "Menu initialized: %s\n", MPLAYER_CONFDIR "/menu.conf");
else {
- mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_MenuInitFailed);
+ mp_msg(MSGT_CPLAYER, MSGL_ERR, "Menu init failed.\n");
use_menu = 0;
}
}
Modified: trunk/stream/ai_alsa.c
==============================================================================
--- trunk/stream/ai_alsa.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/stream/ai_alsa.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -171,7 +171,7 @@ int ai_alsa_xrun(audio_in_t *ai)
mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_AlsaXRUN,
diff.tv_sec * 1000 + diff.tv_usec / 1000.0);
if (mp_msg_test(MSGT_TV, MSGL_V)) {
- mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_AlsaStatus);
+ mp_msg(MSGT_TV, MSGL_ERR, "ALSA Status:\n");
snd_pcm_status_dump(status, ai->alsa.log);
}
if ((res = snd_pcm_prepare(ai->alsa.handle))<0) {
Modified: trunk/stream/ai_alsa1x.c
==============================================================================
--- trunk/stream/ai_alsa1x.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/stream/ai_alsa1x.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -185,7 +185,7 @@ int ai_alsa_xrun(audio_in_t *ai)
mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_AlsaXRUN,
diff.tv_sec * 1000 + diff.tv_usec / 1000.0);
if (mp_msg_test(MSGT_TV, MSGL_V)) {
- mp_msg(MSGT_TV, MSGL_ERR, MSGTR_MPDEMUX_AIALSA_AlsaStatus);
+ mp_msg(MSGT_TV, MSGL_ERR, "ALSA Status:\n");
snd_pcm_status_dump(status, ai->alsa.log);
}
if ((res = snd_pcm_prepare(ai->alsa.handle))<0) {
Modified: trunk/stream/stream_bluray.c
==============================================================================
--- trunk/stream/stream_bluray.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/stream/stream_bluray.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -329,7 +329,7 @@ err_no_info:
s->type = STREAMTYPE_BLURAY;
s->url = strdup("br://");
- mp_msg(MSGT_OPEN, MSGL_V, MSGTR_BlurayOK);
+ mp_msg(MSGT_OPEN, MSGL_V, "Blu-ray successfully opened.\n");
return STREAM_OK;
}
Modified: trunk/stream/stream_radio.c
==============================================================================
--- trunk/stream/stream_radio.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/stream/stream_radio.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -247,7 +247,7 @@ static int parse_channels(radio_priv_t*
*pfreq=freq_channel;
}
}
- mp_msg(MSGT_RADIO, MSGL_DBG2, MSGTR_RADIO_DoneParsingChannels);
+ mp_msg(MSGT_RADIO, MSGL_DBG2, "[radio] Done parsing channels.\n");
return STREAM_OK;
}
@@ -279,16 +279,16 @@ static int init_frac_v4l2(radio_priv_t*
}
if(tuner.capability & V4L2_TUNER_CAP_LOW){
priv->frac=16000;
- mp_msg(MSGT_RADIO,MSGL_DBG2,MSGTR_RADIO_TunerCapLowYes,priv->frac);
+ mp_msg(MSGT_RADIO, MSGL_DBG2, "[radio] tuner is low:yes frac=%d\n", priv->frac);
}
else{
priv->frac=16;
- mp_msg(MSGT_RADIO,MSGL_DBG2,MSGTR_RADIO_TunerCapLowNo,priv->frac);
+ mp_msg(MSGT_RADIO, MSGL_DBG2, "[radio] tuner is low:no frac=%d\n",priv->frac);
}
priv->rangelow=((float)tuner.rangelow)/priv->frac;
priv->rangehigh=((float)tuner.rangehigh)/priv->frac;
- mp_msg(MSGT_RADIO,MSGL_V,MSGTR_RADIO_FreqRange,priv->rangelow,priv->rangehigh);
+ mp_msg(MSGT_RADIO, MSGL_V, "[radio] Allowed frequency range is %.2f-%.2f MHz.\n", priv->rangelow, priv->rangehigh);
return STREAM_OK;
}
@@ -432,15 +432,15 @@ static int init_frac_v4l(radio_priv_t* p
}
if(tuner.flags & VIDEO_TUNER_LOW){
priv->frac=16000;
- mp_msg(MSGT_RADIO,MSGL_DBG2,MSGTR_RADIO_TunerCapLowYes,priv->frac);
+ mp_msg(MSGT_RADIO, MSGL_DBG2, "[radio] tuner is low:yes frac=%d\n", priv->frac);
}else{
priv->frac=16;
- mp_msg(MSGT_RADIO,MSGL_DBG2,MSGTR_RADIO_TunerCapLowNo,priv->frac);
+ mp_msg(MSGT_RADIO, MSGL_DBG2, "[radio] tuner is low:no frac=%d\n", priv->frac);
}
priv->rangelow=((float)tuner.rangelow)/priv->frac;
priv->rangehigh=((float)tuner.rangehigh)/priv->frac;
- mp_msg(MSGT_RADIO,MSGL_V,MSGTR_RADIO_FreqRange,priv->rangelow,priv->rangehigh);
+ mp_msg(MSGT_RADIO, MSGL_V, "[radio] Allowed frequency range is %.2f-%.2f MHz.\n", priv->rangelow, priv->rangehigh);
return STREAM_OK;
}
@@ -784,7 +784,7 @@ static int read_chunk(audio_in_t *ai, un
static int grab_audio_frame(radio_priv_t *priv, char *buffer, int len)
{
int i;
- mp_msg(MSGT_RADIO, MSGL_DBG3, MSGTR_RADIO_BufferString,"grab_audio_frame",priv->audio_cnt,priv->audio_drop);
+ mp_msg(MSGT_RADIO, MSGL_DBG3, "[radio] grab_audio_frame: in buffer=%d dropped=%d\n", priv->audio_cnt, priv->audio_drop);
/* Cache buffer must be filled by some audio packets when playing starts.
Otherwise MPlayer will quit with EOF error.
Probably, there is need more carefull checking rather than simple 'for' loop
@@ -834,7 +834,7 @@ static int init_audio(radio_priv_t *priv
}
priv->do_capture=1;
- mp_msg(MSGT_RADIO,MSGL_V,MSGTR_RADIO_CaptureStarting);
+ mp_msg(MSGT_RADIO, MSGL_V, "[radio] Starting capture stuff.\n");
#ifdef CONFIG_ALSA
while ((tmp = strrchr(priv->radio_param->adevice, '='))){
tmp[0] = ':';
@@ -870,7 +870,7 @@ static int init_audio(radio_priv_t *priv
priv->audio_in.bytes_per_sample+priv->audio_in.blocksize;
if (priv->audio_buffer_size < 256*priv->audio_in.blocksize)
priv->audio_buffer_size = 256*priv->audio_in.blocksize;
- mp_msg(MSGT_RADIO, MSGL_V, MSGTR_RADIO_AudioBuffer,
+ mp_msg(MSGT_RADIO, MSGL_V, "[radio] Audio capture - buffer=%d bytes (block=%d bytes).\n",
priv->audio_buffer_size,priv->audio_in.blocksize);
/* start capture */
priv->audio_ringbuffer = calloc(1, priv->audio_buffer_size);
@@ -968,7 +968,7 @@ int radio_step_channel(struct stream *st
priv->radio_channel_current = priv->radio_channel_list;
if(!radio_set_freq(stream,priv->radio_channel_current->freq))
return 0;
- mp_msg(MSGT_RADIO, MSGL_V, MSGTR_RADIO_SelectedChannel,
+ mp_msg(MSGT_RADIO, MSGL_V, "[radio] Selected channel: %d - %s (freq: %.2f)\n",
priv->radio_channel_current->index, priv->radio_channel_current->name,
priv->radio_channel_current->freq);
break;
@@ -980,7 +980,7 @@ int radio_step_channel(struct stream *st
priv->radio_channel_current = priv->radio_channel_current->next;
if(!radio_set_freq(stream,priv->radio_channel_current->freq))
return 0;
- mp_msg(MSGT_RADIO, MSGL_V, MSGTR_RADIO_SelectedChannel,
+ mp_msg(MSGT_RADIO, MSGL_V, "[radio] Selected channel: %d - %s (freq: %.2f)\n",
priv->radio_channel_current->index, priv->radio_channel_current->name,
priv->radio_channel_current->freq);
break;
@@ -1031,7 +1031,8 @@ int radio_set_channel(struct stream *str
}
}
priv->radio_channel_current=tmp;
- mp_msg(MSGT_RADIO, MSGL_V, MSGTR_RADIO_SelectedChannel, priv->radio_channel_current->index,
+ mp_msg(MSGT_RADIO, MSGL_V, "[radio] Selected channel: %d - %s (freq: %.2f)\n",
+ priv->radio_channel_current->index,
priv->radio_channel_current->name, priv->radio_channel_current->freq);
if(!radio_set_freq(stream, priv->radio_channel_current->freq))
return 0;
@@ -1128,7 +1129,7 @@ static int open_s(stream_t *stream,int m
else
priv->driver=NULL;
- mp_msg(MSGT_RADIO,MSGL_V,MSGTR_RADIO_AvailableDrivers);
+ mp_msg(MSGT_RADIO, MSGL_V, "[radio] Available drivers: ");
for(i=0;radio_drivers[i];i++){
mp_msg(MSGT_RADIO,MSGL_V,"%s, ",radio_drivers[i]->name);
if(strcmp(priv->radio_param->driver,radio_drivers[i]->name)==0)
@@ -1164,7 +1165,7 @@ static int open_s(stream_t *stream,int m
close_s(stream);
return STREAM_ERROR;
}
- mp_msg(MSGT_RADIO, MSGL_V, MSGTR_RADIO_RadioDevice, priv->radio_fd,priv->radio_param->device);
+ mp_msg(MSGT_RADIO, MSGL_V, "[radio] Radio fd: %d, %s\n", priv->radio_fd,priv->radio_param->device);
fcntl(priv->radio_fd, F_SETFD, FD_CLOEXEC);
get_volume(priv, &priv->old_snd_volume);
Modified: trunk/stream/tv.c
==============================================================================
--- trunk/stream/tv.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/stream/tv.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -378,7 +378,7 @@ int tv_set_norm(tvi_handle_t *tvh, char*
{
tvh->norm = norm_from_string(tvh, norm);
- mp_msg(MSGT_TV, MSGL_V, MSGTR_TV_SelectedNorm, norm);
+ mp_msg(MSGT_TV, MSGL_V, "Selected norm : %s\n", norm);
if (tvh->functions->control(tvh->priv, TVI_CONTROL_TUN_SET_NORM, &tvh->norm) != TVI_CONTROL_TRUE) {
mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_CannotSetNorm);
return 0;
@@ -392,7 +392,7 @@ static int tv_set_norm_i(tvi_handle_t *t
{
tvh->norm = norm;
- mp_msg(MSGT_TV, MSGL_V, MSGTR_TV_SelectedNormId, norm);
+ mp_msg(MSGT_TV, MSGL_V, "Selected norm id: %d\n", norm);
if (tvh->functions->control(tvh->priv, TVI_CONTROL_TUN_SET_NORM, &tvh->norm) != TVI_CONTROL_TRUE) {
mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_CannotSetNorm);
return 0;
@@ -542,7 +542,7 @@ static int open_tv(tvi_handle_t *tvh)
mp_msg(MSGT_TV, MSGL_WARN, MSGTR_TV_UnableFindChanlist,
tvh->tv_param->chanlist);
else
- mp_msg(MSGT_TV, MSGL_V, MSGTR_TV_SelectedChanlist,
+ mp_msg(MSGT_TV, MSGL_V, "Selected channel list: %s (including %d channels)\n",
chanlists[tvh->chanlist].name, chanlists[tvh->chanlist].count);
if (tvh->tv_param->freq && tvh->tv_param->channel)
@@ -604,14 +604,14 @@ static int open_tv(tvi_handle_t *tvh)
funcs->control(tvh->priv, TVI_CONTROL_TUN_SET_FREQ, &freq);
funcs->control(tvh->priv, TVI_CONTROL_TUN_GET_FREQ, &freq);
- mp_msg(MSGT_TV, MSGL_V, MSGTR_TV_SelectedFrequency,
- freq, (float)freq/16);
+ mp_msg(MSGT_TV, MSGL_V, "Selected frequency: %lu (%.3f)\n",
+ freq, (float)freq/16);
}
if (tvh->tv_param->channel) {
struct CHANLIST cl;
- mp_msg(MSGT_TV, MSGL_V, MSGTR_TV_RequestedChannel, tvh->tv_param->channel);
+ mp_msg(MSGT_TV, MSGL_V, "Requested channel: %s\n", tvh->tv_param->channel);
for (i = 0; i < chanlists[tvh->chanlist].count; i++)
{
cl = tvh->chanlist_s[i];
@@ -840,7 +840,7 @@ static demuxer_t* demux_open_tv(demuxer_
sh_audio->wf->nBlockAlign = sh_audio->samplesize * sh_audio->channels;
sh_audio->wf->nAvgBytesPerSec = sh_audio->i_bps;
- mp_msg(MSGT_DECVIDEO, MSGL_V, MSGTR_TV_AudioFormat,
+ mp_msg(MSGT_DECVIDEO, MSGL_V, " TV audio: %d channels, %d bits, %d Hz\n",
sh_audio->wf->nChannels, sh_audio->wf->wBitsPerSample,
sh_audio->wf->nSamplesPerSec);
@@ -930,7 +930,7 @@ int tv_get_freq(tvi_handle_t *tvh, unsig
if (tvh->functions->control(tvh->priv, TVI_CONTROL_IS_TUNER, 0) == TVI_CONTROL_TRUE)
{
tvh->functions->control(tvh->priv, TVI_CONTROL_TUN_GET_FREQ, freq);
- mp_msg(MSGT_TV, MSGL_V, MSGTR_TV_CurrentFrequency,
+ mp_msg(MSGT_TV, MSGL_V, "Current frequency: %lu (%.3f)\n",
*freq, (float)*freq/16);
}
return 1;
@@ -946,7 +946,7 @@ int tv_set_freq(tvi_handle_t *tvh, unsig
tvh->functions->control(tvh->priv, TVI_CONTROL_TUN_SET_FREQ, &freq);
tvh->functions->control(tvh->priv, TVI_CONTROL_TUN_GET_FREQ, &freq);
- mp_msg(MSGT_TV, MSGL_V, MSGTR_TV_CurrentFrequency,
+ mp_msg(MSGT_TV, MSGL_V, "Current frequency: %lu (%.3f)\n",
freq, (float)freq/16);
}
teletext_control(tvh->demuxer->teletext,TV_VBI_CONTROL_RESET,
Modified: trunk/stream/tvi_dshow.c
==============================================================================
--- trunk/stream/tvi_dshow.c Mon Jul 25 01:55:26 2011 (r33914)
+++ trunk/stream/tvi_dshow.c Mon Jul 25 01:55:34 2011 (r33915)
@@ -1092,7 +1092,7 @@ static HRESULT set_nearest_freq(priv_t *
mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TVI_DS_UnableExtractFreqTable);
return E_FAIL;
};
- mp_msg(MSGT_TV, MSGL_V, MSGTR_TVI_DS_FreqTableLoaded, tunerInput == TunerInputAntenna ? "broadcast" : "cable",
+ mp_msg(MSGT_TV, MSGL_V, "tvi_dshow: loaded system (%s) frequency table for country id=%d (channels:%d).\n", tunerInput == TunerInputAntenna ? "broadcast" : "cable",
chanlist2country(priv->tv_param->chanlist), priv->freq_table_len);
}
@@ -1143,7 +1143,7 @@ static int set_frequency(priv_t * priv,
if (priv->direct_setfreq_call) { //using direct call to set frequency
hr = set_frequency_direct(priv->pTVTuner, lFreq);
if (FAILED(hr)) {
- mp_msg(MSGT_TV, MSGL_V, MSGTR_TVI_DS_DirectSetFreqFailed);
+ mp_msg(MSGT_TV, MSGL_V, "tvi_dshow: Unable to set frequency directly. OS built-in channels table will be used.\n");
priv->direct_setfreq_call = 0;
}
}
@@ -1252,7 +1252,7 @@ static void get_capabilities(priv_t * pr
mp_msg(MSGT_TV, MSGL_DBG4, "tvi_dshow: get_capabilities called\n");
if (priv->pTVTuner) {
- mp_msg(MSGT_TV, MSGL_V, MSGTR_TVI_DS_SupportedNorms);
+ mp_msg(MSGT_TV, MSGL_V, "tvi_dshow: supported norms:");
hr = OLE_CALL_ARGS(priv->pTVTuner, get_AvailableTVFormats,
&lAvailableFormats);
if (FAILED(hr))
@@ -1276,7 +1276,7 @@ static void get_capabilities(priv_t * pr
tv_available_inputs = malloc(sizeof(long) * lInputPins);
tv_available_inputs_count = 0;
- mp_msg(MSGT_TV, MSGL_V, MSGTR_TVI_DS_AvailableVideoInputs);
+ mp_msg(MSGT_TV, MSGL_V, "tvi_dshow: available video inputs:");
for (i = 0; i < lInputPins; i++) {
OLE_CALL_ARGS(priv->pCrossbar, get_CrossbarPinInfo, 1, i,
&lRelated, &lPhysicalType);
@@ -1297,7 +1297,7 @@ static void get_capabilities(priv_t * pr
hr = OLE_CALL_ARGS(priv->chains[1]->pCaptureFilter, EnumPins, &pEnum);
if (FAILED(hr))
return;
- mp_msg(MSGT_TV, MSGL_V, MSGTR_TVI_DS_AvailableAudioInputs);
+ mp_msg(MSGT_TV, MSGL_V, "tvi_dshow: available audio inputs:");
i = 0;
while (OLE_CALL_ARGS(pEnum, Next, 1, &pPin, NULL) == S_OK) {
memset(&pi, 0, sizeof(pi));
@@ -1319,7 +1319,7 @@ static void get_capabilities(priv_t * pr
else
OLE_CALL_ARGS(pIAMixer, put_MixLevel, 1.0);
#endif
- mp_msg(MSGT_TV, MSGL_V, MSGTR_TVI_DS_InputSelected);
+ mp_msg(MSGT_TV, MSGL_V, "(selected)");
} else {
OLE_CALL_ARGS(pIAMixer, put_Enable, FALSE);
#if 0
@@ -1992,7 +1992,7 @@ static IBaseFilter *find_capture_device(
if(get_device_name(pM, tmp, DEVICE_NAME_MAX_LEN)!=TVI_CONTROL_TRUE)
mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TVI_DS_UnableGetDeviceName, i);
else
- mp_msg(MSGT_TV, MSGL_V, MSGTR_TVI_DS_DeviceName, i, tmp);
+ mp_msg(MSGT_TV, MSGL_V, "tvi_dshow: Device #%d: %s\n", i, tmp);
if (index != -1 && i == index) {
mp_msg(MSGT_TV, MSGL_INFO, MSGTR_TVI_DS_UsingDevice, index, tmp);
hr = OLE_CALL_ARGS(pM, BindToObject, 0, 0, &IID_IBaseFilter,(void *) &pFilter);
More information about the MPlayer-cvslog
mailing list