X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1479a77bb6c7c2c4c39514129abb3e73734db783..b32851030de5d3706883afa87598cba8a8226f5d:/lib/service/servicedvb.cpp

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index bae45aae..d789da69 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -25,8 +25,6 @@
 #include <byteswap.h>
 #include <netinet/in.h>
 
-#include <dvbsi++/event_information_section.h>
-
 #define INTERNAL_TELETEXT
 
 #ifndef BYTE_ORDER
@@ -149,7 +147,8 @@ public:
 	eStaticServiceDVBPVRInformation(const eServiceReference &ref);
 	RESULT getName(const eServiceReference &ref, std::string &name);
 	int getLength(const eServiceReference &ref);
-	
+	RESULT getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &SWIG_OUTPUT, time_t start_time);
+
 	int getInfo(const eServiceReference &ref, int w);
 	std::string getInfoString(const eServiceReference &ref,int w);
 };
@@ -216,6 +215,24 @@ std::string eStaticServiceDVBPVRInformation::getInfoString(const eServiceReferen
 	}
 }
 
+RESULT eStaticServiceDVBPVRInformation::getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &evt, time_t start_time)
+{
+	if (!ref.path.empty())
+	{
+		ePtr<eServiceEvent> event = new eServiceEvent;
+		std::string filename = ref.path;
+		filename.erase(filename.length()-2, 2);
+		filename+="eit";
+		if (!event->parseFrom(filename, (m_parser.m_ref.getTransportStreamID().get()<<16)|m_parser.m_ref.getOriginalNetworkID().get()))
+		{
+			evt = event;
+			return 0;
+		}
+	}
+	evt = 0;
+	return -1;
+}
+
 class eDVBPVRServiceOfflineOperations: public iServiceOfflineOperations
 {
 	DECLARE_REF(eDVBPVRServiceOfflineOperations);
@@ -489,11 +506,11 @@ RESULT eDVBServiceList::startEdit(ePtr<iMutableServiceList> &res)
 	return -1;
 }
 
-RESULT eDVBServiceList::addService(eServiceReference &ref)
+RESULT eDVBServiceList::addService(eServiceReference &ref, eServiceReference before)
 {
 	if (!m_bouquet)
 		return -1;
-	return m_bouquet->addService(ref);
+	return m_bouquet->addService(ref, before);
 }
 
 RESULT eDVBServiceList::removeService(eServiceReference &ref)
@@ -758,25 +775,15 @@ RESULT eDVBServicePlay::start()
 		std::string filename = service.path;
 		filename.erase(filename.length()-2, 2);
 		filename+="eit";
-		int fd = ::open( filename.c_str(), O_RDONLY );
-		if ( fd > -1 )
+		ePtr<eServiceEvent> event = new eServiceEvent;
+		if (!event->parseFrom(filename, (service.getTransportStreamID().get()<<16)|service.getOriginalNetworkID().get()))
 		{
-			__u8 buf[4096];
-			int rd = ::read(fd, buf, 4096);
-			::close(fd);
-			if ( rd > 12 /*EIT_LOOP_SIZE*/ )
-			{
-				Event ev(buf);
-				ePtr<eServiceEvent> event = new eServiceEvent;
-				ePtr<eServiceEvent> empty;
-				event->parseFrom(&ev, (service.getTransportStreamID().get()<<16)|service.getOriginalNetworkID().get());
-				m_event_handler.inject(event, 0);
-				m_event_handler.inject(empty, 1);
-				eDebug("injected");
-			}
+			ePtr<eServiceEvent> empty;
+			m_event_handler.inject(event, 0);
+			m_event_handler.inject(empty, 1);
 		}
 	}
-	
+
 	if (m_is_pvr)
 		loadCuesheet();
 
@@ -787,6 +794,29 @@ RESULT eDVBServicePlay::start()
 
 RESULT eDVBServicePlay::stop()
 {
+		/* add bookmark for last play position */
+	if (m_is_pvr)
+	{
+		pts_t play_position;
+		if (!getPlayPosition(play_position))
+		{
+				/* remove last position */
+			for (std::multiset<struct cueEntry>::iterator i(m_cue_entries.begin()); i != m_cue_entries.end();)
+			{
+				if (i->what == 3) /* current play position */
+				{
+					m_cue_entries.erase(i);
+					i = m_cue_entries.begin();
+					continue;
+				} else
+					++i;
+			}
+			
+			m_cue_entries.insert(cueEntry(play_position, 3)); /* last play position */
+			m_cuesheet_changed = 1;
+		}
+	}
+
 	stopTimeshift(); /* in case timeshift was enabled, remove buffer etc. */
 
 	m_service_handler_timeshift.free();
@@ -1799,7 +1829,7 @@ void eDVBServicePlay::loadCuesheet()
 #endif
 			what = ntohl(what);
 			
-			if (what > 2)
+			if (what > 3)
 				break;
 			
 			m_cue_entries.insert(cueEntry(where, what));
@@ -1855,7 +1885,7 @@ void eDVBServicePlay::cutlistToCuesheet()
 	if (!m_cutlist_enabled)
 	{
 		m_cue->commitSpans();
-		eDebug("cutlists where disabled");
+		eDebug("cutlists were disabled");
 		return;
 	}
 
@@ -1876,7 +1906,7 @@ void eDVBServicePlay::cutlistToCuesheet()
 				continue;
 			} else if (i->what == 1) /* out */
 				out = i++->where;
-			else /* mark */
+			else /* mark (2) or last play position (3) */
 			{
 				i++;
 				continue;