git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more robust timer sanity check / autoincrement handling, small code cleanup
[enigma2.git]
/
lib
/
base
/
encoding.cpp
diff --git
a/lib/base/encoding.cpp
b/lib/base/encoding.cpp
index e4e1531c921d4ed4483fc1d8608703b8c1ba1501..361acce55d43a9f1f7e14236461dd4cc3205ef3a 100644
(file)
--- 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 <cstdlib>
#include <lib/base/encoding.h>
#include <lib/base/eerror.h>
+#include <lib/base/eenv.h>
eDVBTextEncodingHandler encodingHandler; // the one and only instance
eDVBTextEncodingHandler encodingHandler; // the one and only instance
@@
-17,8
+18,8
@@
inline char toupper(char c)
eDVBTextEncodingHandler::eDVBTextEncodingHandler()
{
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);
if (f)
{
char *line = (char*) malloc(256);
@@
-61,7
+62,7
@@
eDVBTextEncodingHandler::eDVBTextEncodingHandler()
free(line);
}
else
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)
}
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;
m_CountryCodeDefaultMapping.find(country_code);
if ( it != m_CountryCodeDefaultMapping.end() )
return it->second;
- return
0; // Latin1/ISO6397
+ return
1; // ISO8859-1 / Latin1
}
}