Rework of prefered language code to support both possible iso639 codes

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@372 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2010-02-18 12:48:55 +00:00
parent 150376bfe0
commit 0fc1a8fe07
11 changed files with 60 additions and 74 deletions

View File

@@ -134,6 +134,7 @@ const char * getISO639Description(const char * const iso)
#else
std::map<std::string, std::string> iso639;
std::map<std::string, std::string> iso639rev;
void initialize_iso639_map(void)
{
@@ -147,8 +148,10 @@ void initialize_iso639_map(void)
{
getline(in, v);
iso639[s] = v;
if (s != t)
if (s != t) {
iso639[t] = v;
}
iso639rev[v] = s;
}
}
else

View File

@@ -42,6 +42,7 @@
void initialize_iso639_map(void);
const char * getISO639Description(const char * const iso);
extern std::map<std::string, std::string> iso639;
extern std::map<std::string, std::string> iso639rev;
#define ARE_LOCALES_EQUAL(a,b) (a == b)

View File

@@ -95,7 +95,7 @@ struct SNeutrinoSettings
char language[25];
char timezone[150];
std::string pref_lang[3];
char pref_lang[3][30];
// EPG
int epg_save;