X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/cf5341701c32afc934b3ff0dc75a28c7e9f264ee..995273c1f71c79d72fa75da25da4a03bd83ac9a4:/lib/service/servicedvb.h

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 4a40df12..0bd12bd8 100644
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -38,7 +38,7 @@ class eBouquet;
 
 class eDVBServiceList: public iListableService, public iMutableServiceList
 {
-DECLARE_REF(eDVBServiceList);
+	DECLARE_REF(eDVBServiceList);
 public:
 	virtual ~eDVBServiceList();
 	PyObject *getContent(const char* formatstr, bool sorted=false);
@@ -91,7 +91,7 @@ class eDVBServicePlay: public eDVBServiceBase,
 		public iCueSheet, public iSubtitleOutput, public iAudioDelay,
 		public iRdsDecoder, public iStreamableService
 {
-DECLARE_REF(eDVBServicePlay);
+	DECLARE_REF(eDVBServicePlay);
 public:
 	virtual ~eDVBServicePlay();
 
@@ -113,6 +113,7 @@ public:
 	RESULT subtitle(ePtr<iSubtitleOutput> &ptr);
 	RESULT audioDelay(ePtr<iAudioDelay> &ptr);
 	RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr);
+	RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = 0; return -1; }
 
 		// iPauseableService
 	RESULT pause();
@@ -139,6 +140,7 @@ public:
 	int getNumberOfTracks();
 	RESULT selectTrack(unsigned int i);
 	RESULT getTrackInfo(struct iAudioTrackInfo &, unsigned int n);
+	int getCurrentTrack();
 
 		// iAudioChannelSelection	
 	int getCurrentChannel();
@@ -194,6 +196,7 @@ private:
 		/* in timeshift mode, we essentially have two channels, and thus pmt handlers. */
 	eDVBServicePMTHandler m_service_handler_timeshift;
 	eDVBServiceEITHandler m_event_handler;
+	int m_current_audio_pid;
 	
 	eDVBServicePlay(const eServiceReference &ref, eDVBService *service);
 	
@@ -214,7 +217,7 @@ private:
 	ePtr<iDVBDemux> m_decode_demux;
 
 	int m_current_audio_stream;
-	int selectAudioStream(int n);
+	int selectAudioStream(int n = -1);
 	
 		/* timeshift */
 	ePtr<iDVBTSRecorder> m_record;