X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/62df50fabcb503c81aaaac60819bda2578317323..5c4cd1a455e924e578478c97d00b799ef3192ef0:/lib/service/event.cpp

diff --git a/lib/service/event.cpp b/lib/service/event.cpp
index f84c38b7..4dda5779 100644
--- a/lib/service/event.cpp
+++ b/lib/service/event.cpp
@@ -10,6 +10,18 @@
 #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";
+
+void eServiceEvent::setEPGLanguage( const std::string language )
+{
+	m_language = language;
+}
+///////////////////////////
+
 DEFINE_REF(eServiceEvent);
 DEFINE_REF(eComponentData);
 
@@ -165,9 +177,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 +188,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;
@@ -204,7 +236,7 @@ RESULT eServiceEvent::getComponentData(ePtr<eComponentData> &dest, int tagnum) c
 	return -1;
 }
 
-RESULT eServiceEvent::getLinkageService(eServiceReference &service, int num) const
+RESULT eServiceEvent::getLinkageService(eServiceReference &service, eServiceReference &parent, int num) const
 {
 	std::list<eServiceReference>::const_iterator it =
 		m_linkage_services.begin();
@@ -213,6 +245,25 @@ RESULT eServiceEvent::getLinkageService(eServiceReference &service, int num) con
 	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;