From ea2cbb6bb5c54034403fd6db74edc942cbb63a54 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 6 Jul 2004 11:14:29 +0000 Subject: [PATCH] Console message corrected and moved to help_mp-en.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12764 b3059339-0415-0410-9bf9-f77b7e298cf2 --- help/help_mp-en.h | 5 +++++ libmpcodecs/vd_dmo.c | 5 ++--- libmpcodecs/vd_dshow.c | 5 ++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/help/help_mp-en.h b/help/help_mp-en.h index 61fb4d494b..3b4c235155 100644 --- a/help/help_mp-en.h +++ b/help/help_mp-en.h @@ -360,6 +360,11 @@ static char help_text[]= #define MSGTR_MovieAspectIsSet "Movie-Aspect is %.2f:1 - prescaling to correct movie aspect.\n" #define MSGTR_MovieAspectUndefined "Movie-Aspect is undefined - no prescaling applied.\n" +// vd_dshow.c, vd_dmo.c +#define MSGTR_DownloadCodecPackage "You need to upgrade/install the binary codecs package.\nGo to http://mplayerhq.hu/homepage/dload.html\n" +#define MSGTR_DShowInitOK "INFO: Win32/DShow video codec init OK.\n" +#define MSGTR_DMOInitOK "INFO: Win32/DMO video codec init OK.\n" + // x11_common.c #define MSGTR_EwmhFullscreenStateFailed "\nX11: Couldn't send EWMH fullscreen Event!\n" diff --git a/libmpcodecs/vd_dmo.c b/libmpcodecs/vd_dmo.c index 04385eb1d5..2e0e884d2a 100644 --- a/libmpcodecs/vd_dmo.c +++ b/libmpcodecs/vd_dmo.c @@ -32,8 +32,7 @@ static int init(sh_video_t *sh){ unsigned int out_fmt; if(!(sh->context=DMO_VideoDecoder_Open(sh->codec->dll,&sh->codec->guid, sh->bih, 0, 0))){ mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MissingDLLcodec,sh->codec->dll); - mp_msg(MSGT_DECVIDEO,MSGL_HINT,"Maybe you forget to upgrade your win32 codecs?? It's time to download the new\n"); - mp_msg(MSGT_DECVIDEO,MSGL_HINT,"package from: ftp://mplayerhq.hu/MPlayer/releases/w32codec.tar.bz2!\n"); + mp_msg(MSGT_DECVIDEO,MSGL_HINT,MSGTR_DownloadCodecPackage); return 0; } if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YUY2)) return 0; @@ -52,7 +51,7 @@ static int init(sh_video_t *sh){ DMO_VideoDecoder_SetDestFmt(sh->context,out_fmt&255,0); // RGB/BGR } DMO_VideoDecoder_StartInternal(sh->context); - mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32/DMOhow video codec init OK!\n"); + mp_msg(MSGT_DECVIDEO,MSGL_V,MSGTR_DMOInitOK); return 1; } diff --git a/libmpcodecs/vd_dshow.c b/libmpcodecs/vd_dshow.c index ef5309d58c..a91a28ee92 100644 --- a/libmpcodecs/vd_dshow.c +++ b/libmpcodecs/vd_dshow.c @@ -52,8 +52,7 @@ static int init(sh_video_t *sh){ unsigned int out_fmt; if(!(sh->context=DS_VideoDecoder_Open(sh->codec->dll,&sh->codec->guid, sh->bih, 0, 0))){ mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MissingDLLcodec,sh->codec->dll); - mp_msg(MSGT_DECVIDEO,MSGL_HINT,"Maybe you forget to upgrade your win32 codecs?? It's time to download the new\n"); - mp_msg(MSGT_DECVIDEO,MSGL_HINT,"package from: ftp://mplayerhq.hu/MPlayer/releases/w32codec.tar.bz2!\n"); + mp_msg(MSGT_DECVIDEO,MSGL_HINT,MSGTR_DownloadCodecPackage); return 0; } if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YUY2)) return 0; @@ -73,7 +72,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,"INFO: Win32/DShow video codec init OK!\n"); + mp_msg(MSGT_DECVIDEO,MSGL_V,MSGTR_DShowInitOK); return 1; }