fix typo

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

diff --git a/lib/service/event.cpp b/lib/service/event.cpp
index 81a8d4bb1de2f6e195e4409617e74dcb62ea8146..07c92c52ffd7b25f3af11cb31081b1a7268b8d5b 100644 (file)
--- a/lib/service/event.cpp
+++ b/lib/service/event.cpp
@@ -2,6 +2,7 @@
 #include <lib/base/estring.h>
 #include <lib/base/encoding.h>
 #include <lib/dvb/dvbtime.h>
+#include <lib/dvb/idvb.h>
 #include <dvbsi++/event_information_section.h>
 #include <dvbsi++/short_event_descriptor.h>
 #include <dvbsi++/extended_event_descriptor.h>
@@ -9,6 +10,15 @@
 #include <dvbsi++/component_descriptor.h>
 #include <dvbsi++/descriptor_tag.h>
 
+// 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);
 
@@ -119,7 +129,8 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid)
                                        data.m_componentType = cp->getComponentType();
                                        data.m_componentTag = cp->getComponentTag();
                                        data.m_iso639LanguageCode = cp->getIso639LanguageCode();
-                                       data.m_text = convertDVBUTF8(cp->getText());
+                                       int table=encodingHandler.getCountryCodeDefaultMapping(data.m_iso639LanguageCode);
+                                       data.m_text = convertDVBUTF8(cp->getText(),table,tsidonid);
                                        m_component_data.push_back(data);
                                        break;
                                }
@@ -128,14 +139,16 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid)
                                        const LinkageDescriptor  *ld = (LinkageDescriptor*)*desc;
                                        if ( ld->getLinkageType() == 0xB0 )
                                        {
-                                               linkage_service s;
-                                               s.m_onid = ld->getOriginalNetworkId();
-                                               s.m_tsid = ld->getTransportStreamId();
-                                               s.m_sid = ld->getServiceId();
-                                               const PrivateDataByteVector *privateData =
-                                                       ld->getPrivateDataBytes();
-                                               s.m_description.assign((const char*)&((*privateData)[0]), privateData->size());
-                                               m_linkage_services.push_back(s);
+                                               eServiceReference ref;
+                                               ref.type = eServiceReference::idDVB;
+                                               eServiceReferenceDVB &dvb_ref = (eServiceReferenceDVB&) ref;
+                                               dvb_ref.setServiceType(1);
+                                               dvb_ref.setTransportStreamID(ld->getTransportStreamId());
+                                               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);
+                                               m_linkage_services.push_back(ref);
                                        }
                                        break;
                                }
@@ -159,10 +172,10 @@ RESULT eServiceEvent::parseFrom(Event *evt, int tsidonid)
                (stime_bcd >> 8)&0xFF,
                stime_bcd & 0xFF
        );
+       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))
@@ -199,4 +212,38 @@ RESULT eServiceEvent::getComponentData(ePtr<eComponentData> &dest, int tagnum) c
        return -1;
 }
 
+RESULT eServiceEvent::getLinkageService(eServiceReference &service, eServiceReference &parent, int num) const
+{
+       std::list<eServiceReference>::const_iterator it =
+               m_linkage_services.begin();
+       while( it != m_linkage_services.end() && num-- )
+               ++it;
+       if ( it != m_linkage_services.end() )
+       {
+               service = *it;
+               eServiceReferenceDVB &subservice = (eServiceReferenceDVB&) service;
+               eServiceReferenceDVB &current = (eServiceReferenceDVB&) parent;
+               subservice.setDVBNamespace(current.getDVBNamespace());
+               if ( current.getParentTransportStreamID().get() )
+               {
+                       subservice.setParentTransportStreamID( current.getParentTransportStreamID() );
+                       subservice.setParentServiceID( current.getParentServiceID() );
+               }
+               else
+               {
+                       subservice.setParentTransportStreamID( current.getTransportStreamID() );
+                       subservice.setParentServiceID( current.getServiceID() );
+               }
+               if ( subservice.getParentTransportStreamID() == subservice.getTransportStreamID() &&
+                       subservice.getParentServiceID() == subservice.getServiceID() )
+               {
+                       subservice.setParentTransportStreamID( eTransportStreamID(0) );
+                       subservice.setParentServiceID( eServiceID(0) );
+               }
+               return 0;
+       }
+       service.type = eServiceReference::idInvalid;
+       return -1;
+}
+
 DEFINE_REF(eDebugClass);