From: Andreas Monzner Date: Thu, 8 Dec 2005 17:06:29 +0000 (+0000) Subject: add each country code in lower and upper case X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=065d3ac0f19a6f2c61c3f8aa80a6cd8784ff7a7f;hp=3d42d707a1aca0fda2f9810ea36ec47d52f4b2c2 add each country code in lower and upper case --- diff --git a/lib/base/encoding.cpp b/lib/base/encoding.cpp index e865169..48be787 100644 --- a/lib/base/encoding.cpp +++ b/lib/base/encoding.cpp @@ -4,6 +4,16 @@ eDVBTextEncodingHandler encodingHandler; // the one and only instance +char toupper(char c) +{ + switch (c) + { + case 'a' ... 'z': + return c-32; + } + return c; +} + eDVBTextEncodingHandler::eDVBTextEncodingHandler() { const char * file=DATADIR "/enigma2/encoding.conf"; @@ -19,7 +29,13 @@ eDVBTextEncodingHandler::eDVBTextEncodingHandler() continue; int tsid, onid, encoding; if ( sscanf( line, "%s ISO8859-%d", countrycode, &encoding ) == 2 ) + { + m_CountryCodeDefaultMapping[countrycode]=encoding; + countrycode[0]=toupper(countrycode[0]); + countrycode[1]=toupper(countrycode[1]); + countrycode[2]=toupper(countrycode[2]); m_CountryCodeDefaultMapping[countrycode]=encoding; + } else if ( (sscanf( line, "0x%x 0x%x ISO8859-%d", &tsid, &onid, &encoding ) == 3 ) ||(sscanf( line, "%d %d ISO8859-%d", &tsid, &onid, &encoding ) == 3 ) ) m_TransponderDefaultMapping[(tsid<<16)|onid]=encoding;