X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f94e2c9821eb8784ca03b7122485d4720ec6d6e6..57e05465c68a8154f0bace3dfe36db98bb85c3be:/lib/service/event.cpp

diff --git a/lib/service/event.cpp b/lib/service/event.cpp
index cfd2ac5f..2d0f83a4 100644
--- a/lib/service/event.cpp
+++ b/lib/service/event.cpp
@@ -2,12 +2,16 @@
 #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>
+#include <dvbsi++/linkage_descriptor.h>
+#include <dvbsi++/component_descriptor.h>
 #include <dvbsi++/descriptor_tag.h>
 
 DEFINE_REF(eServiceEvent);
+DEFINE_REF(eComponentData);
 
 const char MAX_LANG = 37;
 /* OSD language (see /share/locales/locales) to iso639 conversion table */
@@ -60,6 +64,9 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid)
 	{
 		switch ((*desc)->getTag())
 		{
+			case LINKAGE_DESCRIPTOR:
+				m_linkage_services.clear();
+				break;
 			case SHORT_EVENT_DESCRIPTOR:
 			{
 				const ShortEventDescriptor *sed = (ShortEventDescriptor*)*desc;
@@ -99,6 +106,46 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid)
 				break;
 		}
 	}
+	if ( retval == 1 )
+	{
+		for (DescriptorConstIterator desc = evt->getDescriptors()->begin(); desc != evt->getDescriptors()->end(); ++desc)
+		{
+			switch ((*desc)->getTag())
+			{
+				case COMPONENT_DESCRIPTOR:
+				{
+					const ComponentDescriptor *cp = (ComponentDescriptor*)*desc;
+					eComponentData data;
+					data.m_streamContent = cp->getStreamContent();
+					data.m_componentType = cp->getComponentType();
+					data.m_componentTag = cp->getComponentTag();
+					data.m_iso639LanguageCode = cp->getIso639LanguageCode();
+					int table=encodingHandler.getCountryCodeDefaultMapping(data.m_iso639LanguageCode);
+					data.m_text = convertDVBUTF8(cp->getText(),table,tsidonid);
+					m_component_data.push_back(data);
+					break;
+				}
+				case LINKAGE_DESCRIPTOR:
+				{
+					const LinkageDescriptor  *ld = (LinkageDescriptor*)*desc;
+					if ( ld->getLinkageType() == 0xB0 )
+					{
+						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;
+				}
+			}
+		}
+	}
 	if ( m_extended_description.find(m_short_description) == 0 )
 		m_short_description="";
 	return retval;
@@ -116,6 +163,7 @@ 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++)
@@ -129,7 +177,7 @@ RESULT eServiceEvent::parseFrom(Event *evt, int tsidonid)
 	return 0;
 }
 
-std::string eServiceEvent::getBeginTimeString()
+std::string eServiceEvent::getBeginTimeString() const
 {
 	tm t;
 	localtime_r(&m_begin, &t);
@@ -140,4 +188,54 @@ std::string eServiceEvent::getBeginTimeString()
 	return std::string(tmp, 12);
 }
 
+RESULT eServiceEvent::getComponentData(ePtr<eComponentData> &dest, int tagnum) const
+{
+	std::list<eComponentData>::const_iterator it =
+		m_component_data.begin();
+	for(;it != m_component_data.end(); ++it)
+	{
+		if ( it->m_componentTag == tagnum )
+		{
+			dest=new eComponentData(*it);
+			return 0;
+		}
+	}
+	dest=0;
+	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);