use glib function to escape file uri in mediaplayer

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

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 43e4690f8b3509395d21c58f607ed1f390741d67..dafaf35d68eb7bad40b5f7a2ec0bcb6ef2ef6bb4 100644 (file)
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -114,13 +114,14 @@ public:
        RESULT audioDelay(ePtr<iAudioDelay> &ptr);
        RESULT rdsDecoder(ePtr<iRdsDecoder> &ptr);
        RESULT keys(ePtr<iServiceKeys> &ptr) { ptr = 0; return -1; }
        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);
 
                // iPauseableService
        RESULT pause();
        RESULT unpause();
        RESULT setSlowMotion(int ratio);
        RESULT setFastForward(int ratio);

-       
+

                // iSeekableService
        RESULT getLength(pts_t &len);
        RESULT seekTo(pts_t to);
                // iSeekableService
        RESULT getLength(pts_t &len);
        RESULT seekTo(pts_t to);


@@ -158,9 +159,10 @@ public:
 
                // iTimeshiftService
        RESULT startTimeshift();
 
                // iTimeshiftService
        RESULT startTimeshift();

-       RESULT stopTimeshift();
+       RESULT stopTimeshift(bool swToLive=true);

        int isTimeshiftActive();
        RESULT activateTimeshift();
        int isTimeshiftActive();
        RESULT activateTimeshift();

+       RESULT setNextPlaybackFile(const char *fn);

 
                // iCueSheet
        PyObject *getCutList();
 
                // iCueSheet
        PyObject *getCutList();


@@ -182,6 +184,7 @@ public:
                // iStreamableService
        RESULT stream(ePtr<iStreamableService> &ptr);
        PyObject *getStreamingData();
                // iStreamableService
        RESULT stream(ePtr<iStreamableService> &ptr);
        PyObject *getStreamingData();

+

 private:
        friend class eServiceFactoryDVB;
        eServiceReference m_reference;
 private:
        friend class eServiceFactoryDVB;
        eServiceReference m_reference;


@@ -208,17 +211,16 @@ private:
        Signal2<void,iPlayableService*,int> m_event;
        
                /* pvr */
        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;
        
        int m_first_program_info;
        

-       std::string m_timeshift_file;
+       std::string m_timeshift_file, m_timeshift_file_next;

        int m_timeshift_fd;
        int m_timeshift_fd;

-       

        ePtr<iDVBDemux> m_decode_demux;
 
        int m_current_audio_stream;
        int selectAudioStream(int n = -1);
        ePtr<iDVBDemux> m_decode_demux;
 
        int m_current_audio_stream;
        int selectAudioStream(int n = -1);

-       RESULT setFastForward_internal(int ratio);
+       RESULT setFastForward_internal(int ratio, bool final_seek=false);

        
                /* timeshift */
        ePtr<iDVBTSRecorder> m_record;
        
                /* timeshift */
        ePtr<iDVBTSRecorder> m_record;


@@ -226,11 +228,15 @@ private:
 
        void updateTimeshiftPids();
        void switchToLive();
 
        void updateTimeshiftPids();
        void switchToLive();

+
+       void resetTimeshift(int start);

        void switchToTimeshift();
        void switchToTimeshift();

-       
-       void updateDecoder();
+
+       void updateDecoder(bool sendSeekableStateChanged=false);

        
        int m_skipmode;
        
        int m_skipmode;

+       int m_fastforward;
+       int m_slowmotion;

        
                /* cuesheet */
        
        
                /* cuesheet */