X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0adf3ed39b6fe254154e3b4c38feea616e5aece1..c9474b61671ed008fc7f18f8bbaafe0fd0a39dd2:/lib/service/servicedvb.h

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 3f133d69..b40341f7 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -44,7 +44,7 @@ public:
 	PyObject *getContent(const char* formatstr, bool sorted=false);
 	RESULT getContent(std::list<eServiceReference> &list, bool sorted=false);
 	RESULT getNext(eServiceReference &ptr);
-	int compareLessEqual(const eServiceReference &a, const eServiceReference &b);
+	inline int compareLessEqual(const eServiceReference &a, const eServiceReference &b);
 	
 	RESULT startEdit(ePtr<iMutableServiceList> &);
 	RESULT flushChanges();
@@ -63,10 +63,15 @@ private:
 	eBouquet *m_bouquet;
 };
 
+inline int eDVBServiceList::compareLessEqual(const eServiceReference &a, const eServiceReference &b)
+{
+	return m_query->compareLessEqual((const eServiceReferenceDVB&)a, (const eServiceReferenceDVB&)b);
+}
+
 class eDVBServiceBase: public iFrontendInformation
 {
 protected:
-	eDVBServicePMTHandler m_service_handler	;
+	eDVBServicePMTHandler m_service_handler;
 public:
 		// iFrontendInformation
 	int getFrontendInfo(int w);
@@ -151,13 +156,14 @@ public:
 
 		// iCueSheet
 	PyObject *getCutList();
-	void setCutList(PyObject *);
+	void setCutList(SWIG_PYOBJECT(ePyObject));
 	void setCutListEnable(int enable);
 	
 		// iSubtitleOutput
-	RESULT enableSubtitles(eWidget *parent, PyObject *entry);
+	RESULT enableSubtitles(eWidget *parent, SWIG_PYOBJECT(ePyObject) entry);
 	RESULT disableSubtitles(eWidget *parent);
 	PyObject *getSubtitleList();
+	PyObject *getCachedSubtitle();
 
 		// iAudioDelay
 	int getAC3Delay();
@@ -174,6 +180,7 @@ private:
 	ePtr<iTSMPEGDecoder> m_decoder;
 	int m_is_primary;
 	int m_have_video_pid;
+	int m_tune_state;
 	
 		/* in timeshift mode, we essentially have two channels, and thus pmt handlers. */
 	eDVBServicePMTHandler m_service_handler_timeshift;
@@ -245,16 +252,16 @@ private:
 	ePtr<eDVBTeletextParser> m_teletext_parser;
 	void newSubtitlePage(const eDVBTeletextSubtitlePage &p);
 	ePtr<eConnection> m_new_subtitle_page_connection;
-	eTimer m_subtitle_sync_timer;
 	std::list<eDVBTeletextSubtitlePage> m_subtitle_pages;
-	void checkSubtitleTiming();
 	
 		/* dvb subtitles */
-	void newDVBSubtitleRegion(const eDVBSubtitleRegion &p);
-	ePtr<eConnection> m_new_dvb_subtitle_region_connection;
-	eTimer m_dvb_subtitle_sync_timer;
-	std::list<eDVBSubtitleRegion> m_dvb_subtitle_regions;
-	void checkDvbSubtitleTiming();
+	ePtr<eDVBSubtitleParser> m_subtitle_parser;
+	void newDVBSubtitlePage(const eDVBSubtitlePage &p);
+	ePtr<eConnection> m_new_dvb_subtitle_page_connection;
+	std::list<eDVBSubtitlePage> m_dvb_subtitle_pages;
+
+	eTimer m_subtitle_sync_timer;
+	void checkSubtitleTiming();
 
 		/* radiotext */
 	ePtr<eDVBRadioTextParser> m_radiotext_parser;
@@ -262,4 +269,16 @@ private:
 	void radioTextUpdated();
 };
 
+class eStaticServiceDVBBouquetInformation: public iStaticServiceInformation
+{
+	DECLARE_REF(eStaticServiceDVBBouquetInformation);
+	eServiceReference m_playable_service;
+public:
+	eServiceReference &getPlayableService() { return m_playable_service; }
+	RESULT getName(const eServiceReference &ref, std::string &name);
+	int getLength(const eServiceReference &ref);
+	int isPlayable(const eServiceReference &ref, const eServiceReference &ignore);
+	RESULT getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr, time_t start_time);
+};
+
 #endif