X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fbase%2Fencoding.cpp;h=831de8474583c581ff1596de4ce8f58f4317e4fc;hp=5d6617d998d49b3ff222f6bdd8ed71876a1fa688;hb=65efcb9d542de70854e33520ddd0d9838632a0e6;hpb=0ebee4265be628e8b2c354a071e9fab37303c663

diff --git a/lib/base/encoding.cpp b/lib/base/encoding.cpp
index 5d6617d..831de84 100644
--- a/lib/base/encoding.cpp
+++ b/lib/base/encoding.cpp
@@ -1,3 +1,5 @@
+#include <cstdio>
+#include <cstdlib>
 #include <lib/base/encoding.h>
 #include <lib/base/eerror.h>
 
@@ -27,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]);
@@ -35,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]=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);