use hex instead of decimal

[enigma2.git] / lib / service / event.cpp

diff --git a/lib/service/event.cpp b/lib/service/event.cpp
index 07c92c52ffd7b25f3af11cb31081b1a7268b8d5b..07eafbc9bceb0614073f2109bdca86497a73513d 100644 (file)
--- a/lib/service/event.cpp
+++ b/lib/service/event.cpp
@@ -10,6 +10,9 @@
 #include <dvbsi++/component_descriptor.h>
 #include <dvbsi++/descriptor_tag.h>
 
+#include <sys/types.h>
+#include <fcntl.h>
+
 // static members / methods
 std::string eServiceEvent::m_language = "de_DE";
 
@@ -81,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);
@@ -94,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;
@@ -185,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;
@@ -246,4 +274,9 @@ RESULT eServiceEvent::getLinkageService(eServiceReference &service, eServiceRefe
        return -1;
 }
 
+void setServiceEventLanguage(const std::string language)
+{
+       eServiceEvent::setEPGLanguage(language);
+}
+
 DEFINE_REF(eDebugClass);