Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv12641 Modified Files: dec_audio.c dec_video.c Log Message: messages moved from dec_??d?o.c Index: dec_audio.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_audio.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dec_audio.c 25 May 2002 11:42:40 -0000 1.6 +++ dec_audio.c 13 Aug 2002 16:04:16 -0000 1.7 @@ -34,12 +34,12 @@ mpadec=mpcodecs_ad_drivers[i]; break; } if(!mpadec){ - mp_msg(MSGT_DECAUDIO,MSGL_ERR,"Requested audio codec family [%s] (afm=%d) not available (enable it at compile time!)\n", + mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_AudioCodecFamilyNotAvailable, sh_audio->codec->name, sh_audio->codec->driver); return 0; // no such driver } - mp_msg(MSGT_DECAUDIO,MSGL_INFO,"Opening audio decoder: [%s] %s\n",mpadec->info->short_name,mpadec->info->name); + mp_msg(MSGT_DECAUDIO,MSGL_INFO,MSGTR_OpeningAudioDecoder,mpadec->info->short_name,mpadec->info->name); // reset in/out buffer size/pointer: sh_audio->a_buffer_size=0; @@ -64,14 +64,14 @@ if(!mpadec->preinit(sh_audio)) { - mp_msg(MSGT_DECAUDIO,MSGL_ERR,"ADecoder preinit failed :(\n"); + mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_ADecoderPreinitFailed); return 0; } /* 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,"dec_audio: Allocating %d bytes for input buffer\n", + mp_msg(MSGT_DECAUDIO,MSGL_V,MSGTR_AllocatingBytesForInputBuffer, sh_audio->a_in_buffer_size); sh_audio->a_in_buffer=malloc(sh_audio->a_in_buffer_size); memset(sh_audio->a_in_buffer,0,sh_audio->a_in_buffer_size); @@ -81,7 +81,7 @@ /* allocate audio out buffer: */ sh_audio->a_buffer_size=sh_audio->audio_out_minsize+MAX_OUTBURST; /* worst case calc.*/ - mp_msg(MSGT_DECAUDIO,MSGL_V,"dec_audio: Allocating %d + %d = %d bytes for output buffer\n", + mp_msg(MSGT_DECAUDIO,MSGL_V,MSGTR_AllocatingBytesForOutputBuffer, sh_audio->audio_out_minsize,MAX_OUTBURST,sh_audio->a_buffer_size); sh_audio->a_buffer=malloc(sh_audio->a_buffer_size); @@ -93,7 +93,7 @@ sh_audio->a_buffer_len=0; if(!mpadec->init(sh_audio)){ - mp_msg(MSGT_DECAUDIO,MSGL_WARN,"ADecoder init failed :(\n"); + mp_msg(MSGT_DECAUDIO,MSGL_WARN,MSGTR_ADecoderInitFailed); uninit_audio(sh_audio); // free buffers return 0; } @@ -119,7 +119,7 @@ if(sh_audio->a_in_buffer) free(sh_audio->a_in_buffer); sh_audio->a_in_buffer=NULL; if(!sh_audio->inited) return; - mp_msg(MSGT_DECAUDIO,MSGL_V,"uninit audio: %d \n",sh_audio->codec->driver); + mp_msg(MSGT_DECAUDIO,MSGL_V,MSGTR_UninitAudio,sh_audio->codec->driver); mpadec->uninit(sh_audio); sh_audio->inited=0; } Index: dec_video.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/dec_video.c,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- dec_video.c 4 Aug 2002 02:21:50 -0000 1.144 +++ dec_video.c 13 Aug 2002 16:04:16 -0000 1.145 @@ -49,14 +49,14 @@ if(vf){ int ret=vf->control(vf,VFCTRL_QUERY_MAX_PP_LEVEL,NULL); if(ret>0){ - mp_msg(MSGT_DECVIDEO,MSGL_INFO,"[PP] Using external postprocessing filter, max q = %d\n",ret); + mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_UsingExternalPP,ret); return ret; } } if(mpvdec){ int ret=mpvdec->control(sh_video,VDCTRL_QUERY_MAX_PP_LEVEL,NULL); if(ret>0){ - mp_msg(MSGT_DECVIDEO,MSGL_INFO,"[PP] Using codec's postprocessing, max q = %d\n",ret); + mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_UsingCodecPP,ret); return ret; } } @@ -93,7 +93,7 @@ if(mpvdec) if( mpvdec->control(sh_video,VDCTRL_SET_EQUALIZER, item, (int *)value) == CONTROL_OK) return 1; - mp_msg(MSGT_DECVIDEO,MSGL_INFO,"Video attribute '%s' isn't supported by selected vo & vd! \n",item); + mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_VideoAttributeNotSupportedByVO_VD,item); return 0; } @@ -135,7 +135,7 @@ void uninit_video(sh_video_t *sh_video){ if(!sh_video->inited) return; - mp_msg(MSGT_DECVIDEO,MSGL_V,"uninit video: %d \n",sh_video->codec->driver); + mp_msg(MSGT_DECVIDEO,MSGL_V,MSGTR_UninitVideo,sh_video->codec->driver); mpvdec->uninit(sh_video); vf_uninit_filter_chain(sh_video->vfilter); sh_video->inited=0; @@ -164,7 +164,7 @@ if(mpcodecs_vd_drivers[i]->info->id==sh_video->codec->driver) break; mpvdec=mpcodecs_vd_drivers[i]; if(!mpvdec){ // driver not available (==compiled in) - mp_msg(MSGT_DECVIDEO,MSGL_WARN,"Requested video codec family [%s] (vfm=%d) not available (enable it at compile time!)\n", + mp_msg(MSGT_DECVIDEO,MSGL_WARN,MSGTR_VideoCodecFamilyNotAvailable, sh_video->codec->name, sh_video->codec->driver); continue; } @@ -181,9 +181,9 @@ } } // init() - mp_msg(MSGT_DECVIDEO,MSGL_INFO,"Opening video decoder: [%s] %s\n",mpvdec->info->short_name,mpvdec->info->name); + mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_OpeningVideoDecoder,mpvdec->info->short_name,mpvdec->info->name); if(!mpvdec->init(sh_video)){ - mp_msg(MSGT_DECVIDEO,MSGL_INFO,"VDecoder init failed :(\n"); + mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_VDecoderInitFailed); continue; // try next... } // Yeah! We got it!