[MPlayer-dev-eng] [PATCH] correct message in vd_dshow vd_dmo and move to help file

Diego Biurrun diego at biurrun.de
Sun Jul 4 18:37:03 CEST 2004


Hi!

There is a message in vd_dmo.c and vd_dshow.c that advises users to
grab a codec package that has been superceded by newer versions with
different names a LOOOONG time ago.  This patch fixes the message and
moves it to help_mp-en.h.  I moved the other remaining message in
those files as well while I was at it.

I'll apply in the next days if nobody complains.

Diego


--- libmpcodecs/vd_dmo.c	20 Dec 2002 21:43:18 -0000	1.2
+++ libmpcodecs/vd_dmo.c	4 Jul 2004 16:08:02 -0000
@@ -32,8 +32,7 @@
     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 @@
 	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;
 }
 
--- libmpcodecs/vd_dshow.c	20 Dec 2002 21:43:18 -0000	1.8
+++ libmpcodecs/vd_dshow.c	4 Jul 2004 16:08:02 -0000
@@ -52,8 +52,7 @@
     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 @@
     }
     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;
 }
 
--- help/help_mp-en.h	28 Jun 2004 21:18:53 -0000	1.120
+++ help/help_mp-en.h	4 Jul 2004 16:08:03 -0000
@@ -360,6 +360,11 @@
 #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"
 




More information about the MPlayer-dev-eng mailing list