diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2009-07-31 23:42:32 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2009-07-31 23:42:32 +0200 |
| commit | 9e0b367cd7017f8abf3e3ea804966ce6e23a768f (patch) | |
| tree | 758fb4cd61c4002fc1347afbc24832729beb9e3a /lib | |
| parent | 9c7e1039e429cf818b0a199a970ffc3778bf278c (diff) | |
| download | enigma2-9e0b367cd7017f8abf3e3ea804966ce6e23a768f.tar.gz enigma2-9e0b367cd7017f8abf3e3ea804966ce6e23a768f.zip | |
fix convertDVBUTF8 default table (0 is now iso6397 but we want iso8859-1)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base/estring.h | 4 | ||||
| -rw-r--r-- | lib/service/event.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/base/estring.h b/lib/base/estring.h index 99b839bd..727d591e 100644 --- a/lib/base/estring.h +++ b/lib/base/estring.h @@ -12,7 +12,7 @@ int strnicmp(const char*, const char*, int); std::string getNum(int num, int base=10); -std::string convertDVBUTF8(const unsigned char *data, int len, int table=1, int tsidonid=0); // with default ISO8859-1 / Latin1 +std::string convertDVBUTF8(const unsigned char *data, int len, int table=1, int tsidonid=1); // with default ISO8859-1 / Latin1 std::string convertLatin1UTF8(const std::string &string); int isUTF8(const std::string &string); @@ -20,7 +20,7 @@ std::string removeDVBChars(const std::string &s); void makeUpper(std::string &s); std::string replace_all(const std::string &in, const std::string &entity, const std::string &symbol); -inline std::string convertDVBUTF8(const std::string &string, int table=1, int tsidonid=0) // with default ISO8859-1 / Latin1 +inline std::string convertDVBUTF8(const std::string &string, int table=1, int tsidonid=1) // with default ISO8859-1 / Latin1 { return convertDVBUTF8((const unsigned char*)string.c_str(), string.length(), table, tsidonid); } diff --git a/lib/service/event.cpp b/lib/service/event.cpp index e15eebfc..949e150a 100644 --- a/lib/service/event.cpp +++ b/lib/service/event.cpp @@ -154,7 +154,7 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid) dvb_ref.setOriginalNetworkID(ld->getOriginalNetworkId()); dvb_ref.setServiceID(ld->getServiceId()); const PrivateDataByteVector *privateData = ld->getPrivateDataBytes(); - dvb_ref.name = convertDVBUTF8((const unsigned char*)&((*privateData)[0]), privateData->size(), 0, tsidonid); + dvb_ref.name = convertDVBUTF8((const unsigned char*)&((*privateData)[0]), privateData->size(), 1, tsidonid); m_linkage_services.push_back(ref); } break; |
