X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fbase%2Fencoding.cpp;h=361acce55d43a9f1f7e14236461dd4cc3205ef3a;hp=831de8474583c581ff1596de4ce8f58f4317e4fc;hb=36cca1d3f31265929ef3443999ab7fd242b4dae5;hpb=6f3208500f3b07aaa3733b0b47f2e7a00426ed3e

diff --git a/lib/base/encoding.cpp b/lib/base/encoding.cpp
index 831de84..361acce 100644
--- a/lib/base/encoding.cpp
+++ b/lib/base/encoding.cpp
@@ -2,6 +2,7 @@
 #include <cstdlib>
 #include <lib/base/encoding.h>
 #include <lib/base/eerror.h>
+#include <lib/base/eenv.h>
 
 eDVBTextEncodingHandler encodingHandler;  // the one and only instance
 
@@ -17,8 +18,8 @@ inline char toupper(char c)
 
 eDVBTextEncodingHandler::eDVBTextEncodingHandler()
 {
-	const char * file=DATADIR "/enigma2/encoding.conf";
-	FILE *f = fopen(file, "rt");
+	std::string file = eEnv::resolve("${datadir}/enigma2/encoding.conf");
+	FILE *f = fopen(file.c_str(), "rt");
 	if (f)
 	{
 		char *line = (char*) malloc(256);
@@ -42,14 +43,14 @@ eDVBTextEncodingHandler::eDVBTextEncodingHandler()
 			}
 			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;
+				m_TransponderDefaultMapping[(tsid<<16)|onid]=0;
 			else if ( sscanf( line, "%s ISO%d", countrycode, &encoding ) == 2 && encoding == 6397 )
 			{
-				m_CountryCodeDefaultMapping[countrycode]=64;
+				m_CountryCodeDefaultMapping[countrycode]=0;
 				countrycode[0]=toupper(countrycode[0]);
 				countrycode[1]=toupper(countrycode[1]);
 				countrycode[2]=toupper(countrycode[2]);
-				m_CountryCodeDefaultMapping[countrycode]=64;
+				m_CountryCodeDefaultMapping[countrycode]=0;
 			}
 			else if ( (sscanf( line, "0x%x 0x%x", &tsid, &onid ) == 2 )
 					||(sscanf( line, "%d %d", &tsid, &onid ) == 2 ) )
@@ -61,7 +62,7 @@ eDVBTextEncodingHandler::eDVBTextEncodingHandler()
 		free(line);
 	}
 	else
-		eDebug("[eDVBTextEncodingHandler] couldn't open %s !", file);
+		eDebug("[eDVBTextEncodingHandler] couldn't open %s !", file.c_str());
 }
 
 void eDVBTextEncodingHandler::getTransponderDefaultMapping(int tsidonid, int &table)
@@ -83,5 +84,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 1;  // ISO8859-1 / Latin1
 }