X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4cdeb9ebe328382bb4ef6a01b67ff840adcc84ad..2dac4014cda43ec1d56d3de2ad53da8274f336d6:/lib/service/event.cpp diff --git a/lib/service/event.cpp b/lib/service/event.cpp index 2d0f83a4..07eafbc9 100644 --- a/lib/service/event.cpp +++ b/lib/service/event.cpp @@ -10,6 +10,18 @@ #include #include +#include +#include + +// static members / methods +std::string eServiceEvent::m_language = "de_DE"; + +void eServiceEvent::setEPGLanguage( const std::string language ) +{ + m_language = language; +} +/////////////////////////// + DEFINE_REF(eServiceEvent); DEFINE_REF(eComponentData); @@ -72,7 +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); - if (lang.empty() || cc == lang) + if (lang.empty()) + lang = cc; // use first found language + if (cc == lang) { m_event_name = convertDVBUTF8(sed->getEventName(), table, tsidonid); m_short_description = convertDVBUTF8(sed->getText(), table, tsidonid); @@ -85,7 +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); - if (lang.empty() || cc == lang) + if (lang.empty()) + lang = cc; // use first found language + if (cc == lang) { m_extended_description += convertDVBUTF8(eed->getText(), table, tsidonid); retval=1; @@ -165,9 +181,8 @@ RESULT eServiceEvent::parseFrom(Event *evt, int tsidonid) ); m_event_id = evt->getEventId(); m_duration = fromBCD(duration>>16)*3600+fromBCD(duration>>8)*60+fromBCD(duration); - std::string country="de_DE"; // TODO use local data here for (int i=0; i < MAX_LANG; i++) - if (country==ISOtbl[i][0]) + if (m_language==ISOtbl[i][0]) if (loadLanguage(evt, ISOtbl[i][1], tsidonid)) return 0; if (loadLanguage(evt, "eng", tsidonid)) @@ -177,6 +192,27 @@ RESULT eServiceEvent::parseFrom(Event *evt, int tsidonid) return 0; } +RESULT eServiceEvent::parseFrom(const std::string filename, int tsidonid) +{ + if (!filename.empty()) + { + int fd = ::open( filename.c_str(), O_RDONLY ); + if ( fd > -1 ) + { + __u8 buf[4096]; + int rd = ::read(fd, buf, 4096); + ::close(fd); + if ( rd > 12 /*EIT_LOOP_SIZE*/ ) + { + Event ev(buf); + parseFrom(&ev, tsidonid); + return 0; + } + } + } + return -1; +} + std::string eServiceEvent::getBeginTimeString() const { tm t; @@ -238,4 +274,9 @@ RESULT eServiceEvent::getLinkageService(eServiceReference &service, eServiceRefe return -1; } +void setServiceEventLanguage(const std::string language) +{ + eServiceEvent::setEPGLanguage(language); +} + DEFINE_REF(eDebugClass);