add seekChapter method to iSeekableService interface

[enigma2.git] / lib / service / servicedvb.h

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index d725087cd21fecee759a3c15b5cf7e2f637bd306..d7d05c7833e5cd6f1faf1480ad401a48e9d28048 100644 (file)
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -89,7 +89,7 @@ class eDVBServicePlay: public eDVBServiceBase,
                public iAudioTrackSelection, public iAudioChannelSelection,
                public iSubserviceList, public iTimeshiftService,
                public iCueSheet, public iSubtitleOutput, public iAudioDelay,
-               public iRdsDecoder
+               public iRdsDecoder, public iStreamableService
 {
 DECLARE_REF(eDVBServicePlay);
 public:
@@ -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();
@@ -127,6 +128,7 @@ public:
        RESULT getPlayPosition(pts_t &pos);
        RESULT setTrickmode(int trick=0);
        RESULT isCurrentlySeekable();
+       RESULT seekChapter(int chapter);
 
                // iServiceInformation
        RESULT getName(std::string &name);
@@ -139,6 +141,7 @@ public:
        int getNumberOfTracks();
        RESULT selectTrack(unsigned int i);
        RESULT getTrackInfo(struct iAudioTrackInfo &, unsigned int n);
+       int getCurrentTrack();
 
                // iAudioChannelSelection       
        int getCurrentChannel();
@@ -176,7 +179,10 @@ public:
        int getPCMDelay();
        void setAC3Delay(int);
        void setPCMDelay(int);
-
+       
+               // iStreamableService
+       RESULT stream(ePtr<iStreamableService> &ptr);
+       PyObject *getStreamingData();
 private:
        friend class eServiceFactoryDVB;
        eServiceReference m_reference;
@@ -191,6 +197,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);
        
@@ -211,7 +218,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;
@@ -221,7 +228,7 @@ private:
        void switchToLive();
        void switchToTimeshift();
        
-       void updateDecoder(int intopause=0);
+       void updateDecoder();
        
        int m_skipmode;