Merge branch 'bug_411_timeshift_disable_without_live'
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 12 Feb 2010 13:23:06 +0000 (14:23 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 12 Feb 2010 13:23:06 +0000 (14:23 +0100)
lib/service/iservice.h
lib/service/servicedvb.cpp
lib/service/servicedvb.h

index c477f11..c35313f 100644 (file)
@@ -593,7 +593,7 @@ class iTimeshiftService: public iObject
 #endif
 public:
        virtual RESULT startTimeshift()=0;
-       virtual RESULT stopTimeshift()=0;
+       virtual RESULT stopTimeshift(bool swToLive=true)=0;
 
        virtual int isTimeshiftActive()=0;
                        /* this essentially seeks to the relative end of the timeshift buffer */
index 1a3cb0e..558bf0c 100644 (file)
@@ -2085,12 +2085,13 @@ RESULT eDVBServicePlay::startTimeshift()
        return 0;
 }
 
-RESULT eDVBServicePlay::stopTimeshift()
+RESULT eDVBServicePlay::stopTimeshift(bool swToLive)
 {
        if (!m_timeshift_enabled)
                return -1;
        
-       switchToLive();
+       if (swToLive)
+               switchToLive();
        
        m_timeshift_enabled = 0;
        
index 42647b9..1262836 100644 (file)
@@ -159,7 +159,7 @@ public:
 
                // iTimeshiftService
        RESULT startTimeshift();
-       RESULT stopTimeshift();
+       RESULT stopTimeshift(bool swToLive=true);
        int isTimeshiftActive();
        RESULT activateTimeshift();