From 9e0b367cd7017f8abf3e3ea804966ce6e23a768f Mon Sep 17 00:00:00 2001 From: ghost Date: Fri, 31 Jul 2009 23:42:32 +0200 Subject: [PATCH] fix convertDVBUTF8 default table (0 is now iso6397 but we want iso8859-1) --- lib/base/estring.h | 4 ++-- 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 99b839b..727d591 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 e15eebf..949e150 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; -- 2.7.4