servicedvb.cpp: more exact resume after seek and slowmotion

[vuplus_dvbapp] / lib / service / servicedvb.h

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 7c785c4..e3c7fd5 100644 (file)
--- 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);
@@ -81,7 +81,7 @@ public:
        PyObject *getAll(bool original); // a sum of getFrontendData/Status/TransponderData
 };
 
-class eSubtitleWidget; 
+class eSubtitleWidget;
 
 class eDVBServicePlay: public eDVBServiceBase,
                public iPlayableService, public iPauseableService, 
@@ -89,9 +89,9 @@ 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);
+       DECLARE_REF(eDVBServicePlay);
 public:
        virtual ~eDVBServicePlay();
 
@@ -113,13 +113,15 @@ 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; }
+       RESULT streamed(ePtr<iStreamedService> &ptr) { ptr = 0; return -1; }
 
                // iPauseableService
        RESULT pause();
        RESULT unpause();
        RESULT setSlowMotion(int ratio);
        RESULT setFastForward(int ratio);
-       
+
                // iSeekableService
        RESULT getLength(pts_t &len);
        RESULT seekTo(pts_t to);
@@ -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,6 +179,10 @@ public:
        int getPCMDelay();
        void setAC3Delay(int);
        void setPCMDelay(int);
+       
+               // iStreamableService
+       RESULT stream(ePtr<iStreamableService> &ptr);
+       PyObject *getStreamingData();
 
 private:
        friend class eServiceFactoryDVB;
@@ -191,6 +198,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);
        
@@ -202,7 +210,7 @@ private:
        Signal2<void,iPlayableService*,int> m_event;
        
                /* pvr */
-       int m_is_pvr, m_is_paused, m_timeshift_enabled, m_timeshift_active;
+       int m_is_pvr, m_is_paused, m_timeshift_enabled, m_timeshift_active, m_timeshift_changed;
        int m_first_program_info;
        
        std::string m_timeshift_file;
@@ -211,7 +219,8 @@ private:
        ePtr<iDVBDemux> m_decode_demux;
 
        int m_current_audio_stream;
-       int selectAudioStream(int n);
+       int selectAudioStream(int n = -1);
+       RESULT setFastForward_internal(int ratio, bool final_seek=false);
        
                /* timeshift */
        ePtr<iDVBTSRecorder> m_record;
@@ -224,6 +233,8 @@ private:
        void updateDecoder();
        
        int m_skipmode;
+       int m_fastforward;
+       int m_slowmotion;
        
                /* cuesheet */
        
@@ -266,7 +277,7 @@ private:
        ePtr<eConnection> m_new_dvb_subtitle_page_connection;
        std::list<eDVBSubtitlePage> m_dvb_subtitle_pages;
 
-       eTimer m_subtitle_sync_timer;
+       ePtr<eTimer> m_subtitle_sync_timer;
        void checkSubtitleTiming();
 
                /* radiotext */
@@ -276,7 +287,6 @@ private:
 
        ePtr<eConnection> m_video_event_connection;
        void video_event(struct iTSMPEGDecoder::videoEvent);
-       struct iTSMPEGDecoder::videoEvent m_videoEventData;
 };
 
 class eStaticServiceDVBBouquetInformation: public iStaticServiceInformation
@@ -287,7 +297,7 @@ 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);
+       int isPlayable(const eServiceReference &ref, const eServiceReference &ignore, bool simulate=false);
        RESULT getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr, time_t start_time);
 };