diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-04-19 23:33:44 +0200 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-04-19 23:33:44 +0200 |
| commit | e8f443313e47e0653d61d23c90352572194e5608 (patch) | |
| tree | 7188d3ea5a8c91066fe1dfd5f7241eeb3e3c5226 /lib/base | |
| parent | 2d7f4e102ee3231bdb600b0ac7e2d8f898034b78 (diff) | |
| parent | 0d076f400e8740e55289427c0f19c8055c74bbc5 (diff) | |
| download | enigma2-e8f443313e47e0653d61d23c90352572194e5608.tar.gz enigma2-e8f443313e47e0653d61d23c90352572194e5608.zip | |
Merge branch 'master' of /home/tmbinc/enigma2-git
Diffstat (limited to 'lib/base')
| -rw-r--r-- | lib/base/encoding.cpp | 19 | ||||
| -rw-r--r-- | lib/base/estring.cpp | 8 |
2 files changed, 20 insertions, 7 deletions
diff --git a/lib/base/encoding.cpp b/lib/base/encoding.cpp index 45fea102..6a997cf1 100644 --- a/lib/base/encoding.cpp +++ b/lib/base/encoding.cpp @@ -28,7 +28,10 @@ eDVBTextEncodingHandler::eDVBTextEncodingHandler() if ( line[0] == '#' ) continue; int tsid, onid, encoding; - if ( sscanf( line, "%s ISO8859-%d", countrycode, &encoding ) == 2 ) + 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; + else if ( sscanf( line, "%s ISO8859-%d", countrycode, &encoding ) == 2 ) { m_CountryCodeDefaultMapping[countrycode]=encoding; countrycode[0]=toupper(countrycode[0]); @@ -36,9 +39,17 @@ eDVBTextEncodingHandler::eDVBTextEncodingHandler() 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; + else if ( (sscanf( line, "0x%x 0x%x ISO%d", &tsid, &onid, &encoding ) == 3 && encoding == 6397 ) + ||(sscanf( line, "%d %d ISO%d", &tsid, &onid, &encoding ) == 3 && encoding == 6397 ) ) + m_TransponderDefaultMapping[(tsid<<16)|onid]=64; + else if ( sscanf( line, "%s ISO%d", countrycode, &encoding ) == 2 && encoding == 6397 ) + { + m_CountryCodeDefaultMapping[countrycode]=64; + countrycode[0]=toupper(countrycode[0]); + countrycode[1]=toupper(countrycode[1]); + countrycode[2]=toupper(countrycode[2]); + m_CountryCodeDefaultMapping[countrycode]=64; + } else if ( (sscanf( line, "0x%x 0x%x", &tsid, &onid ) == 2 ) ||(sscanf( line, "%d %d", &tsid, &onid ) == 2 ) ) m_TransponderUseTwoCharMapping.insert((tsid<<16)|onid); diff --git a/lib/base/estring.cpp b/lib/base/estring.cpp index c5076a80..85bbcc69 100644 --- a/lib/base/estring.cpp +++ b/lib/base/estring.cpp @@ -383,9 +383,9 @@ std::string convertDVBUTF8(const unsigned char *data, int len, int table, int ts break; case 0x10: { -// eDebug("(0x10)text encoded in ISO-8859-%d",n); int n=(data[++i]<<8); n |= (data[++i]); +// eDebug("(0x10)text encoded in ISO-8859-%d",n); ++i; switch(n) { @@ -427,8 +427,10 @@ std::string convertDVBUTF8(const unsigned char *data, int len, int table, int ts bool useTwoCharMapping = tsidonid && encodingHandler.getTransponderUseTwoCharMapping(tsidonid); - if (useTwoCharMapping) - table = 64; + if (useTwoCharMapping) { + if (table == 5) + table = 64; + } unsigned char res[2048]; while (i < len) |