frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed selecting preferred audio for multi audio channels

This commit is contained in:
Klaus Schmidinger 2005-09-09 14:50:35 +02:00
parent faedc7862e
commit 5c2cb4df18
2 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
i18n.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: i18n.c 1.205 2005/09/04 14:28:07 kls Exp $ * $Id: i18n.c 1.206 2005/09/09 14:35:53 kls Exp $
* *
* Translations provided by: * Translations provided by:
* *
@ -5538,32 +5538,31 @@ const char *I18nNormalizeLanguageCode(const char *Code)
bool I18nIsPreferredLanguage(int *PreferredLanguages, const char *LanguageCode, int &OldPreference, int *Position) bool I18nIsPreferredLanguage(int *PreferredLanguages, const char *LanguageCode, int &OldPreference, int *Position)
{ {
if (Position) int pos = 1;
*Position = 0; while (LanguageCode) {
Retry: int LanguageIndex = I18nLanguageIndex(LanguageCode);
int LanguageIndex = I18nLanguageIndex(LanguageCode); for (int i = 0; i < I18nNumLanguages; i++) {
for (int i = 0; i < I18nNumLanguages; i++) { if (PreferredLanguages[i] < 0)
if (PreferredLanguages[i] < 0) break; // the language is not a preferred one
break; // the language is not a preferred one if (PreferredLanguages[i] == LanguageIndex) {
if (PreferredLanguages[i] == LanguageIndex) { if (OldPreference < 0 || i < OldPreference) {
if (OldPreference < 0 || i < OldPreference) { OldPreference = i;
OldPreference = i; if (Position)
if (Position && !*Position && strchr(LanguageCode, '+')) *Position = pos;
(*Position)++; break;
return true; }
}
} }
break; if ((LanguageCode = strchr(LanguageCode, '+')) != NULL) {
} LanguageCode++;
} pos++;
if ((LanguageCode = strchr(LanguageCode, '+')) != NULL) { }
LanguageCode++; else if (pos == 1 && Position)
if (Position) *Position = 0;
(*Position)++; }
goto Retry;
}
if (OldPreference < 0) { if (OldPreference < 0) {
OldPreference = I18nNumLanguages; // higher than the maximum possible value OldPreference = I18nNumLanguages; // higher than the maximum possible value
return true; // if we don't find a preferred one, we take the first one return true; // if we don't find a preferred one, we take the first one
} }
return false; return OldPreference >= 0;
} }

11
i18n.h
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: i18n.h 1.15 2005/09/04 14:37:01 kls Exp $ * $Id: i18n.h 1.16 2005/09/09 14:50:35 kls Exp $
*/ */
#ifndef __I18N_H #ifndef __I18N_H
@ -29,6 +29,15 @@ const char *I18nNormalizeLanguageCode(const char *Code);
///< If no normalized language code can be found, the given Code is returned. ///< If no normalized language code can be found, the given Code is returned.
///< Make sure at most 3 characters are copied when using it! ///< Make sure at most 3 characters are copied when using it!
bool I18nIsPreferredLanguage(int *PreferredLanguages, const char *LanguageCode, int &OldPreference, int *Position = NULL); bool I18nIsPreferredLanguage(int *PreferredLanguages, const char *LanguageCode, int &OldPreference, int *Position = NULL);
///< Checks the given LanguageCode (which may be something like "eng" or "eng+deu")
///< against the PreferredLanguages and returns true if one is found that has an index
///< smaller than OldPreference (which should be initialized to -1 before the first
///< call to this function in a sequence of checks). If LanguageCode is not any of
///< the PreferredLanguages, and OldPreference is less than zero, OldPreference will
///< be set to a value higher than the highest language index. If Position is given,
///< it will return 0 if this was a single language code (like "eng"), 1 if it was
///< the first of two language codes (like "eng" out of "eng+deu") and 2 if it was
///< the second one (like "deu" out of ""eng+deu").
#ifdef PLUGIN_NAME_I18N #ifdef PLUGIN_NAME_I18N
#define tr(s) I18nTranslate(s, PLUGIN_NAME_I18N) #define tr(s) I18nTranslate(s, PLUGIN_NAME_I18N)