X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/cedb8844dbefb4723e47ba0610582100b5362409..f995ffff71d819416a89c1bec3ceb69d121daa4e:/lib/service/servicedvb.h

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 61baf6a2..42e38013 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -6,6 +6,7 @@
 
 #include <lib/dvb/pmt.h>
 #include <lib/dvb/eit.h>
+#include <lib/base/filepush.h>
 
 class eServiceFactoryDVB: public iServiceHandler
 {
@@ -32,7 +33,8 @@ class eDVBServiceList: public iListableService, public iMutableServiceList
 DECLARE_REF(eDVBServiceList);
 public:
 	virtual ~eDVBServiceList();
-	RESULT getContent(std::list<eServiceReference> &list);
+	RESULT getContent(std::list<eServiceReference> &list, bool sorted=false);
+	RESULT getContent(PyObject *list, bool sorted=false);
 	RESULT getNext(eServiceReference &ptr);
 	int compareLessEqual(const eServiceReference &a, const eServiceReference &b);
 	
@@ -41,6 +43,7 @@ public:
 	RESULT addService(eServiceReference &ref);
 	RESULT removeService(eServiceReference &ref);
 	RESULT moveService(eServiceReference &ref, int pos);
+	RESULT setListName(const std::string &name);
 private:
 	RESULT startQuery();
 	eServiceReference m_parent;
@@ -55,7 +58,8 @@ private:
 class eDVBServicePlay: public iPlayableService, public iPauseableService, 
 		public iSeekableService, public Object, public iServiceInformation, 
 		public iAudioTrackSelection, public iFrontendStatusInformation,
-		public iSubserviceList, public iTimeshiftService
+		public iSubserviceList, public iTimeshiftService,
+		public iCueSheet
 {
 DECLARE_REF(eDVBServicePlay);
 public:
@@ -72,6 +76,8 @@ public:
 	RESULT frontendStatusInfo(ePtr<iFrontendStatusInformation> &ptr);
 	RESULT subServices(ePtr<iSubserviceList> &ptr);
 	RESULT timeshift(ePtr<iTimeshiftService> &ptr);
+	RESULT cueSheet(ePtr<iCueSheet> &ptr);
+	
 
 		// iPauseableService
 	RESULT pause();
@@ -85,6 +91,7 @@ public:
 	RESULT seekRelative(int direction, pts_t to);
 	RESULT getPlayPosition(pts_t &pos);
 	RESULT setTrickmode(int trick=0);
+	RESULT isCurrentlySeekable();
 
 		// iServiceInformation
 	RESULT getName(std::string &name);
@@ -110,6 +117,10 @@ public:
 	int isTimeshiftActive();
 	RESULT activateTimeshift();
 
+		// iCueSheet
+	PyObject *getCutList();
+	void setCutList(PyObject *);
+	
 private:
 	friend class eServiceFactoryDVB;
 	eServiceReference m_reference;
@@ -131,6 +142,7 @@ private:
 	Signal2<void,iPlayableService*,int> m_event;
 	
 	int m_is_pvr, m_is_paused, m_timeshift_enabled, m_timeshift_active;
+	int m_first_program_info;
 	
 	std::string m_timeshift_file;
 	int m_timeshift_fd;
@@ -148,6 +160,31 @@ private:
 	void switchToTimeshift();
 	
 	void updateDecoder();
+	
+	int m_skipmode;
+	
+	ePtr<eCueSheet> m_cue;
+	
+	struct cueEntry
+	{
+		pts_t where;
+		unsigned int what;
+		
+		bool operator < (const struct cueEntry &o) const
+		{
+			return what < o.what;
+		}
+		cueEntry(const pts_t &where, unsigned int what) :
+			where(where), what(what)
+		{
+		}
+	};
+	
+	std::multiset<cueEntry> m_cue_entries;
+	int m_cuesheet_changed;
+	
+	void loadCuesheet();
+	void saveCuesheet();
 };
 
 #endif