add seekTitle to iSeekableService interface

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

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 34ed9720f082393997e6dbdb521e1d16d090bb65..0c5710d8f19d2c20e442ad43dbae0db011eac566 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 iRadioText
+               public iRdsDecoder, public iStreamableService
 {
 DECLARE_REF(eDVBServicePlay);
 public:
@@ -112,7 +112,8 @@ public:
        RESULT cueSheet(ePtr<iCueSheet> &ptr);
        RESULT subtitle(ePtr<iSubtitleOutput> &ptr);
        RESULT audioDelay(ePtr<iAudioDelay> &ptr);
-       RESULT radioText(ePtr<iRadioText> &ptr);
+       RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr);
+       RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = 0; return -1; }
 
                // iPauseableService
        RESULT pause();
@@ -139,13 +140,17 @@ public:
        int getNumberOfTracks();
        RESULT selectTrack(unsigned int i);
        RESULT getTrackInfo(struct iAudioTrackInfo &, unsigned int n);
+       int getCurrentTrack();
 
                // iAudioChannelSelection       
        int getCurrentChannel();
        RESULT selectChannel(int i);
 
-               // iRadioText
-       std::string getRadioText(int i=0);
+               // iRdsDecoder
+       std::string getText(int i=0);
+       void showRassSlidePicture();
+       void showRassInteractivePic(int page, int subpage);
+       ePyObject getRassInteractiveMask();
 
                // iSubserviceList
        int getNumberOfSubservices();
@@ -173,7 +178,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;
@@ -188,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);
        
@@ -208,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;
@@ -267,9 +276,9 @@ private:
        void checkSubtitleTiming();
 
                /* radiotext */
-       ePtr<eDVBRadioTextParser> m_radiotext_parser;
-       ePtr<eConnection> m_radiotext_updated_connection;
-       void radioTextUpdated();
+       ePtr<eDVBRdsDecoder> m_rds_decoder;
+       ePtr<eConnection> m_rds_decoder_event_connection;
+       void rdsDecoderEvent(int);
 
        ePtr<eConnection> m_video_event_connection;
        void video_event(struct iTSMPEGDecoder::videoEvent);