fix skip backward from live to timeshift

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 39a8b59..527b977 100644 (file)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -1205,10 +1205,7 @@ class InfoBarTimeshift:
                        self.setSeekState(self.SEEK_STATE_PAUSE)
 
                if back:
                        self.setSeekState(self.SEEK_STATE_PAUSE)
 
                if back:

-                       self.doSeek(-5) # seek some gops before end

                        self.ts_rewind_timer.start(200, 1)
                        self.ts_rewind_timer.start(200, 1)

-               else:
-                       self.doSeek(-1) # seek 1 gop before end

 
        def rewindService(self):
                self.setSeekState(self.makeStateBackward(int(config.seek.enter_backward.value)))
 
        def rewindService(self):
                self.setSeekState(self.makeStateBackward(int(config.seek.enter_backward.value)))

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index b71271a..9a995e7 100644 (file)
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -2285,12 +2285,13 @@ void eDVBServicePlay::switchToTimeshift()
        r.path = m_timeshift_file;
 
        m_cue = new eCueSheet();
        r.path = m_timeshift_file;
 
        m_cue = new eCueSheet();

+       m_cue->seekTo(0, -1000);

        m_service_handler_timeshift.tune(r, 1, m_cue, 0, m_dvb_service); /* use the decoder demux for everything */
 
        eDebug("eDVBServicePlay::switchToTimeshift, in pause mode now.");
        pause();
        updateDecoder(); /* mainly to switch off PCR, and to set pause */
        m_service_handler_timeshift.tune(r, 1, m_cue, 0, m_dvb_service); /* use the decoder demux for everything */
 
        eDebug("eDVBServicePlay::switchToTimeshift, in pause mode now.");
        pause();
        updateDecoder(); /* mainly to switch off PCR, and to set pause */

-       
+

        m_event((iPlayableService*)this, evSeekableStatusChanged);
 }
 
        m_event((iPlayableService*)this, evSeekableStatusChanged);
 }