Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv12722 Modified Files: vd.c vf.c Log Message: messages moved from vf.c and vd.c Index: vd.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- vd.c 5 Aug 2002 17:23:22 -0000 1.45 +++ vd.c 13 Aug 2002 23:24:20 -0000 1.46 @@ -139,8 +139,7 @@ #if 1 if(!(sh->disp_w && sh->disp_h)) - mp_msg(MSGT_DECVIDEO,MSGL_WARN, - "VDec: codec didn't set sh->disp_w and sh->disp_h, trying to workaround!\n"); + mp_msg(MSGT_DECVIDEO,MSGL_WARN, MSGTR_CodecDidNotSet); /* XXX: HACK, if sh->disp_* aren't set, * but we have w and h, set them :: atmos */ if(!sh->disp_w && w) @@ -149,8 +148,7 @@ sh->disp_h=h; #endif - mp_msg(MSGT_DECVIDEO,MSGL_INFO,"VDec: vo config request - %d x %d (preferred csp: %s) \n", - w,h,vo_format_name(preferred_outfmt)); + mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_VoConfigRequest,w,h,vo_format_name(preferred_outfmt)); // if(!vf) return 1; // temp hack @@ -178,7 +176,7 @@ if(j<0){ // TODO: no match - we should use conversion... if(strcmp(vf->info->name,"scale")){ - mp_msg(MSGT_DECVIDEO,MSGL_INFO,"Couldn't find matching colorspace - retrying with -vop scale...\n"); + mp_msg(MSGT_DECVIDEO,MSGL_INFO,MSGTR_CouldNotFindColorspace); vf=vf_open_filter(vf,"scale",NULL); goto csp_again; } @@ -234,8 +232,7 @@ } if(sh->aspect>0.01){ int w; - mp_msg(MSGT_CPLAYER,MSGL_INFO,"Movie-Aspect is %.2f:1 - prescaling to correct movie aspect.\n", - sh->aspect); + mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MovieAspectIsSet,sh->aspect); w=(int)((float)screen_size_y*sh->aspect); w+=w%2; // round // we don't like horizontal downscale || user forced width: if(w<screen_size_x || screen_size_xy>8){ @@ -243,7 +240,7 @@ screen_size_y+=screen_size_y%2; // round } else screen_size_x=w; // keep new width } else { - mp_msg(MSGT_CPLAYER,MSGL_INFO,"Movie-Aspect is undefined - no prescaling applied.\n"); + mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MovieAspectUndefined); } } Index: vf.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- vf.c 2 Aug 2002 22:55:54 -0000 1.41 +++ vf.c 13 Aug 2002 23:24:20 -0000 1.42 @@ -238,7 +238,7 @@ int i; for(i=0;;i++){ if(!filter_list[i]){ - mp_msg(MSGT_VFILTER,MSGL_ERR,"Couldn't find video filter '%s'\n",name); + mp_msg(MSGT_VFILTER,MSGL_ERR,MSGTR_CouldNotFindVideoFilter,name); return NULL; // no such filter! } if(!strcmp(filter_list[i]->name,name)) break; @@ -255,15 +255,15 @@ vf->default_reqs=0; if(vf->info->open(vf,args)>0) return vf; // Success! free(vf); - mp_msg(MSGT_VFILTER,MSGL_ERR,"Couldn't open video filter '%s'\n",name); + mp_msg(MSGT_VFILTER,MSGL_ERR,MSGTR_CouldNotOpenVideoFilter,name); return NULL; } vf_instance_t* vf_open_filter(vf_instance_t* next, char *name, char *args){ if(strcmp(name,"vo")) mp_msg(MSGT_VFILTER,MSGL_INFO, - args ? "Opening video filter: [%s=%s]\n" - : "Opening video filter: [%s]\n" ,name,args); + args ? MSGTR_OpeningVideoFilter + : MSGTR_OpeningVideoFilter2 ,name,args); return vf_open_plugin(filter_list,next,name,args); } @@ -315,7 +315,7 @@ vf->next=vf2; flags=vf->next->query_format(vf->next,outfmt); if(!flags){ - mp_msg(MSGT_VFILTER,MSGL_ERR,"Cannot find common colorspace, even by inserting 'scale' :(\n"); + mp_msg(MSGT_VFILTER,MSGL_ERR,MSGTR_CannotFindColorspace); return 0; // FAIL } }