X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/eda995a9610c94750384dd5ab9152c75a9ca9882..191cade7c45bee53df2776ff5bb3f26b2cdafc12:/lib/service/servicedvb.h

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 2785ce2a..4b13193e 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -69,6 +69,8 @@ public:
 	RESULT connectEvent(const Slot2<void,iPlayableService*,int> &event, ePtr<eConnection> &connection);
 	RESULT start();
 	RESULT stop();
+	RESULT setTarget(int target);
+	
 	RESULT seek(ePtr<iSeekableService> &ptr);
 	RESULT pause(ePtr<iPauseableService> &ptr);
 	RESULT info(ePtr<iServiceInformation> &ptr);
@@ -77,7 +79,6 @@ public:
 	RESULT subServices(ePtr<iSubserviceList> &ptr);
 	RESULT timeshift(ePtr<iTimeshiftService> &ptr);
 	RESULT cueSheet(ePtr<iCueSheet> &ptr);
-	
 
 		// iPauseableService
 	RESULT pause();
@@ -98,6 +99,7 @@ public:
 	RESULT getEvent(ePtr<eServiceEvent> &evt, int nownext);
 	int getInfo(int w);
 	std::string getInfoString(int w);
+	PyObject *getInfoObject(int w);
 
 		// iAudioTrackSelection	
 	int getNumberOfTracks();
@@ -106,6 +108,7 @@ public:
 
 		// iFrontendStatusInformation
 	int getFrontendInfo(int w);
+	PyObject *getFrontendData(bool);
 
 		// iSubserviceList
 	int getNumberOfSubservices();
@@ -120,6 +123,7 @@ public:
 		// iCueSheet
 	PyObject *getCutList();
 	void setCutList(PyObject *);
+	void setCutListEnable(int enable);
 	
 private:
 	friend class eServiceFactoryDVB;
@@ -128,6 +132,7 @@ private:
 	ePtr<eDVBService> m_dvb_service;
 	
 	ePtr<iTSMPEGDecoder> m_decoder;
+	int m_is_primary;
 	
 		/* in timeshift mode, we essentially have two channels, and thus pmt handlers. */
 	eDVBServicePMTHandler m_service_handler, m_service_handler_timeshift;
@@ -142,6 +147,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;
@@ -171,7 +177,7 @@ private:
 		
 		bool operator < (const struct cueEntry &o) const
 		{
-			return what < o.what;
+			return where < o.where;
 		}
 		cueEntry(const pts_t &where, unsigned int what) :
 			where(where), what(what)
@@ -180,10 +186,12 @@ private:
 	};
 	
 	std::multiset<cueEntry> m_cue_entries;
-	int m_cuesheet_changed;
+	int m_cuesheet_changed, m_cutlist_enabled;
 	
 	void loadCuesheet();
 	void saveCuesheet();
+	
+	void cutlistToCuesheet();
 };
 
 #endif