X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fbase%2Fencoding.cpp;h=361acce55d43a9f1f7e14236461dd4cc3205ef3a;hp=8b4b592b6bfcd63d24b8aadabee9bcd29c2711ab;hb=879d60c88e24c2c3f2aab9dff73192c901f63f31;hpb=6b59a3472e24f35fcaac669a167b1a4fae207556

diff --git a/lib/base/encoding.cpp b/lib/base/encoding.cpp
index 8b4b592..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);
@@ -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)