add possibility to stopTimeshift but not switch back to live (not used in e2.. but...

this fixes bug #411

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index c477f11db41b4e433d4a3a8fcb0b6fcac44e5352..8b64f166017257108a3cbbe620fbfbf7f0774e92 100644 (file)
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -593,7 +593,7 @@ class iTimeshiftService: public iObject
 #endif
 public:
        virtual RESULT startTimeshift()=0;
-       virtual RESULT stopTimeshift()=0;
+       virtual RESULT stopTimeshift(bool switchToLive=true)=0;
 
        virtual int isTimeshiftActive()=0;
                        /* this essentially seeks to the relative end of the timeshift buffer */

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 615329c9b5d1cf064a08b5f95a246ad6d78c5335..25e723eddb4a10cd1afb26a3db23844a140417cd 100644 (file)
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -2089,12 +2089,13 @@ RESULT eDVBServicePlay::startTimeshift()
        return 0;
 }
 
-RESULT eDVBServicePlay::stopTimeshift()
+RESULT eDVBServicePlay::stopTimeshift(bool switchToLive=true)
 {
        if (!m_timeshift_enabled)
                return -1;
        
-       switchToLive();
+       if (switchToLive)
+               switchToLive();
        
        m_timeshift_enabled = 0;
        

diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h
index 42647b921b5451d4707093f0afc2a802aff183d5..6ab3b347af6a6cd52149081cf5475df1087007d8 100644 (file)
--- a/lib/service/servicedvb.h
+++ b/lib/service/servicedvb.h
@@ -159,7 +159,7 @@ public:
 
                // iTimeshiftService
        RESULT startTimeshift();
-       RESULT stopTimeshift();
+       RESULT stopTimeshift(bool switchToLive=true);
        int isTimeshiftActive();
        RESULT activateTimeshift();