add possibility to set default charset to iso6397 for country codes and transponders

diff --git a/lib/base/encoding.cpp b/lib/base/encoding.cpp
index 45fea10249c1c4206e1b5375df5ba5b61cc4ef01..6a997cf13d8ccc95b871c4ce072a6c132d530e24 100644 (file)
--- 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 ( 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]);
                        {
                                m_CountryCodeDefaultMapping[countrycode]=encoding;
                                countrycode[0]=toupper(countrycode[0]);


@@ -36,9 +39,17 @@ eDVBTextEncodingHandler::eDVBTextEncodingHandler()
                                countrycode[2]=toupper(countrycode[2]);
                                m_CountryCodeDefaultMapping[countrycode]=encoding;
                        }
                                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);
                        else if ( (sscanf( line, "0x%x 0x%x", &tsid, &onid ) == 2 )
                                        ||(sscanf( line, "%d %d", &tsid, &onid ) == 2 ) )
                                m_TransponderUseTwoCharMapping.insert((tsid<<16)|onid);