diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2011-07-06 11:17:02 +0200 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2011-07-06 11:17:02 +0200 |
| commit | 8597efb366be7089ac775457c0cd0a0b8aa6c187 (patch) | |
| tree | c4c9d34bb56596b8981c804179561dcb77129423 | |
| parent | b038197b7dd4de2728506687d4a63299e62dc906 (diff) | |
| download | enigma2-8597efb366be7089ac775457c0cd0a0b8aa6c187.tar.gz enigma2-8597efb366be7089ac775457c0cd0a0b8aa6c187.zip | |
service/event.cpp: use strncasecmp instead of (stupid) c++ stuff
refs #785
| -rw-r--r-- | lib/service/event.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/service/event.cpp b/lib/service/event.cpp index 85c8f5f6..2a4cb0d1 100644 --- a/lib/service/event.cpp +++ b/lib/service/event.cpp @@ -84,11 +84,9 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid) const ShortEventDescriptor *sed = (ShortEventDescriptor*)*desc; const std::string &cc = sed->getIso639LanguageCode(); int table=encodingHandler.getCountryCodeDefaultMapping(cc); - std::string s2; - std::transform(cc.begin(), cc.end(), s2.begin(), tolower); if (lang.empty()) - lang = s2; // use first found language - if (lang == s2) + lang = cc; // use first found language + if (!strncasecmp(lang.c_str(), cc.c_str(), 3)) { m_event_name = convertDVBUTF8(replace_all(replace_all(sed->getEventName(), "\n", " "), "\t", " "), table, tsidonid); m_short_description = convertDVBUTF8(sed->getText(), table, tsidonid); @@ -101,11 +99,9 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid) const ExtendedEventDescriptor *eed = (ExtendedEventDescriptor*)*desc; const std::string &cc = eed->getIso639LanguageCode(); int table=encodingHandler.getCountryCodeDefaultMapping(cc); - std::string s2; - std::transform(cc.begin(), cc.end(), s2.begin(), tolower); if (lang.empty()) - lang = s2; // use first found language - if (lang == s2) + lang = cc; // use first found language + if (!strncasecmp(lang.c_str(), cc.c_str(), 3)) { m_extended_description += convertDVBUTF8(eed->getText(), table, tsidonid); retval=1; |