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

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 2785ce2a..85653caa 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/dvb/teletext.h>
 #include <lib/base/filepush.h>
 
 class eServiceFactoryDVB: public iServiceHandler
@@ -33,8 +34,8 @@ class eDVBServiceList: public iListableService, public iMutableServiceList
 DECLARE_REF(eDVBServiceList);
 public:
 	virtual ~eDVBServiceList();
+	PyObject *getContent(const char* formatstr, bool sorted=false);
 	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);
 	
@@ -55,11 +56,24 @@ private:
 	eBouquet *m_bouquet;
 };
 
-class eDVBServicePlay: public iPlayableService, public iPauseableService, 
+class eDVBServiceBase: public iFrontendInformation
+{
+protected:
+	eDVBServicePMTHandler m_service_handler;
+public:
+		// iFrontendInformation
+	int getFrontendInfo(int w);
+	PyObject *getFrontendData(bool);
+};
+
+class eSubtitleWidget; 
+
+class eDVBServicePlay: public eDVBServiceBase,
+		public iPlayableService, public iPauseableService, 
 		public iSeekableService, public Object, public iServiceInformation, 
-		public iAudioTrackSelection, public iFrontendStatusInformation,
+		public iAudioTrackSelection, public iAudioChannelSelection,
 		public iSubserviceList, public iTimeshiftService,
-		public iCueSheet
+		public iCueSheet, public iSubtitleOutput
 {
 DECLARE_REF(eDVBServicePlay);
 public:
@@ -69,15 +83,18 @@ 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);
+	RESULT audioChannel(ePtr<iAudioChannelSelection> &ptr);
 	RESULT audioTracks(ePtr<iAudioTrackSelection> &ptr);
-	RESULT frontendStatusInfo(ePtr<iFrontendStatusInformation> &ptr);
+	RESULT frontendInfo(ePtr<iFrontendInformation> &ptr);
 	RESULT subServices(ePtr<iSubserviceList> &ptr);
 	RESULT timeshift(ePtr<iTimeshiftService> &ptr);
 	RESULT cueSheet(ePtr<iCueSheet> &ptr);
-	
+	RESULT subtitle(ePtr<iSubtitleOutput> &ptr);
 
 		// iPauseableService
 	RESULT pause();
@@ -98,14 +115,16 @@ public:
 	RESULT getEvent(ePtr<eServiceEvent> &evt, int nownext);
 	int getInfo(int w);
 	std::string getInfoString(int w);
+	PyObject *getInfoObject(int w);
 
 		// iAudioTrackSelection	
 	int getNumberOfTracks();
 	RESULT selectTrack(unsigned int i);
 	RESULT getTrackInfo(struct iAudioTrackInfo &, unsigned int n);
 
-		// iFrontendStatusInformation
-	int getFrontendInfo(int w);
+		// iAudioChannelSelection	
+	int getCurrentChannel();
+	RESULT selectChannel(int i);
 
 		// iSubserviceList
 	int getNumberOfSubservices();
@@ -120,7 +139,13 @@ public:
 		// iCueSheet
 	PyObject *getCutList();
 	void setCutList(PyObject *);
+	void setCutListEnable(int enable);
 	
+		// iSubtitleOutput
+	RESULT enableSubtitles(eWidget *parent, int index);
+	RESULT disableSubtitles(eWidget *parent);
+	SWIG_VOID(RESULT) getSubtitleList(PyList *list);
+
 private:
 	friend class eServiceFactoryDVB;
 	eServiceReference m_reference;
@@ -128,20 +153,24 @@ 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;
+	eDVBServicePMTHandler m_service_handler_timeshift;
 	eDVBServiceEITHandler m_event_handler;
 	
 	eDVBServicePlay(const eServiceReference &ref, eDVBService *service);
 	
+		/* events */
 	void gotNewEvent();
 	
 	void serviceEvent(int event);
 	void serviceEventTimeshift(int event);
 	Signal2<void,iPlayableService*,int> m_event;
 	
+		/* pvr */
 	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;
@@ -151,6 +180,7 @@ private:
 	int m_current_audio_stream;
 	int selectAudioStream(int n);
 	
+		/* timeshift */
 	ePtr<iDVBTSRecorder> m_record;
 	std::set<int> m_pids_active;
 
@@ -162,6 +192,8 @@ private:
 	
 	int m_skipmode;
 	
+		/* cuesheet */
+	
 	ePtr<eCueSheet> m_cue;
 	
 	struct cueEntry
@@ -171,7 +203,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 +212,19 @@ private:
 	};
 	
 	std::multiset<cueEntry> m_cue_entries;
-	int m_cuesheet_changed;
+	int m_cuesheet_changed, m_cutlist_enabled;
 	
 	void loadCuesheet();
 	void saveCuesheet();
+	
+	void cutlistToCuesheet();
+	
+		/* teletext subtitles */
+	void newSubtitlePage(const eDVBTeletextSubtitlePage &p);
+	ePtr<eConnection> m_new_subtitle_page_connection;
+	
+	ePtr<eDVBTeletextParser> m_teletext_parser;
+	eSubtitleWidget *m_subtitle_widget;
 };
 
 #endif