more standard conform handling for dvb-text encodings

[enigma2.git] / lib / base / encoding.cpp

diff --git a/lib/base/encoding.cpp b/lib/base/encoding.cpp
index 48be7873c3fbab7dc7c70884f20dc9e421e1b823..e4e1531c921d4ed4483fc1d8608703b8c1ba1501 100644 (file)
--- a/lib/base/encoding.cpp
+++ b/lib/base/encoding.cpp
@@ -1,10 +1,11 @@
+#include <cstdio>
+#include <cstdlib>
 #include <lib/base/encoding.h>
 #include <lib/base/eerror.h>
-#include <config.h>
 
 eDVBTextEncodingHandler encodingHandler;  // the one and only instance
 
-char toupper(char c)
+inline char toupper(char c)
 {
        switch (c)
        {
@@ -28,7 +29,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 +40,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]=0;
+                       else if ( sscanf( line, "%s ISO%d", countrycode, &encoding ) == 2 && encoding == 6397 )
+                       {
+                               m_CountryCodeDefaultMapping[countrycode]=0;
+                               countrycode[0]=toupper(countrycode[0]);
+                               countrycode[1]=toupper(countrycode[1]);
+                               countrycode[2]=toupper(countrycode[2]);
+                               m_CountryCodeDefaultMapping[countrycode]=0;
+                       }
                        else if ( (sscanf( line, "0x%x 0x%x", &tsid, &onid ) == 2 )
                                        ||(sscanf( line, "%d %d", &tsid, &onid ) == 2 ) )
                                m_TransponderUseTwoCharMapping.insert((tsid<<16)|onid);
@@ -71,5 +83,5 @@ int eDVBTextEncodingHandler::getCountryCodeDefaultMapping( const std::string &co
                m_CountryCodeDefaultMapping.find(country_code);
        if ( it != m_CountryCodeDefaultMapping.end() )
                return it->second;
-       return 0;  // ISO8859-1 / Latin1
+       return 0;  // Latin1/ISO6397
 }