[MPlayer-dev-eng] Re: [Mplayer-cvslog] CVS: 0_90/help help_mp-it.h,1.22,1.23

[Diego Biurrun]

Roberto Togni writes:
 > On 2003.08.05 23:20, Diego Biurrun CVS wrote:
 > ...
 > > -#define MSGTR_TryUpgradeCodecsConfOrRTFM "*** Prova ad aggiornare %s
 > > da etc/codecs.conf\n*** Se non va ancora bene, allora leggi
 > > DOCS/codecs.html!\n"
 > > +#define MSGTR_TryUpgradeCodecsConfOrRTFM "*** Prova ad aggiornare %s
 > > da etc/codecs.conf\n*** Se non va ancora bene, allora leggi
 > > DOCS/Italian/codecs.html!\n"
 > ...
 > This is suggesting to updarte codecs.conf file, but IIRC it's not 
 > installed anymore even in 0.90 tree.
 > Shouldn't we change it into something like "If you have an old codecs.
 > conf file remove it"?

Yes, good point.  The following two messages are obsolete and should
be changed or maybe even removed:

#define MSGTR_CopyCodecsConf "(Copy/link etc/codecs.conf from the MPlayer sources to ~/.mplayer/codecs.conf)\n"
#define MSGTR_TryUpgradeCodecsConfOrRTFM "*** Try to upgrade %s from etc/codecs.conf\n*** If it still does not work, read DOCS/en/codecs.html!\n"

The first is referenced by this snippet of code from mplayer.c (and
almost identically from mencoder.c):

// check codec.conf
if(!parse_codec_cfg(get_path("codecs.conf"))){
  if(!parse_codec_cfg(MPLAYER_CONFDIR "/codecs.conf")){
    if(!parse_codec_cfg(NULL)){
      mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf);
      exit(0);
    }
    mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_BuiltinCodecsConf);
  }
}

I don't know how to best change this, but the message should be
obsolete..

For the second message I propose the following patch (removing the old
message from the translations intentionally left out to save space).
OK to commit?

Diego

--- help/help_mp-en.h	21 Aug 2003 11:38:09 -0000	1.106
+++ help/help_mp-en.h	22 Aug 2003 02:10:03 -0000
@@ -81,7 +81,7 @@
 #define MSGTR_TryForceAudioFmtStr "Trying to force audio codec driver family %s ...\n"
 #define MSGTR_CantFindAfmtFallback "Cannot find audio codec for forced driver family, falling back to other drivers.\n"
 #define MSGTR_CantFindAudioCodec "Cannot find codec for audio format 0x%X.\n"
-#define MSGTR_TryUpgradeCodecsConfOrRTFM "*** Try to upgrade %s from etc/codecs.conf\n*** If it still does not work, read DOCS/en/codecs.html!\n"
+#define MSGTR_RTFMCodecs "Read DOCS/en/codecs.html!\n"
 #define MSGTR_CouldntInitAudioCodec "Could not initialize audio codec -> no sound.\n"
 #define MSGTR_TryForceVideoFmtStr "Trying to force video codec driver family %s ...\n"
 #define MSGTR_CantFindVideoCodec "Cannot find codec matching selected -vo and video format 0x%X.\n"
--- libmpcodecs/dec_audio.c	9 Jun 2003 12:15:44 -0000	1.25
+++ libmpcodecs/dec_audio.c	22 Aug 2003 02:10:03 -0000
@@ -242,8 +242,8 @@
 }
 
 if(!sh_audio->inited){
-    mp_msg(MSGT_DECAUDIO,MSGL_HINT, MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("codecs.conf"));
     mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_CantFindAudioCodec,sh_audio->format);
+    mp_msg(MSGT_DECAUDIO,MSGL_HINT, MSGTR_RTFMCodecs);
     return 0; // failed
 }
 
--- libmpcodecs/dec_video.c	9 Jun 2003 12:15:44 -0000	1.158
+++ libmpcodecs/dec_video.c	22 Aug 2003 02:10:03 -0000
@@ -280,8 +280,8 @@
 }
 
 if(!sh_video->inited){
-    mp_msg(MSGT_DECVIDEO,MSGL_HINT, MSGTR_TryUpgradeCodecsConfOrRTFM,get_path("codecs.conf"));
     mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_CantFindVideoCodec,sh_video->format);
+    mp_msg(MSGT_DECAUDIO,MSGL_HINT, MSGTR_RTFMCodecs);
     return 0; // failed
 }