From 39bcbbae7cd1d2db59ddbf6cbae665313a322f3a Mon Sep 17 00:00:00 2001 From: ghost Date: Fri, 22 Jan 2010 15:06:12 +0100 Subject: add possibility to stopTimeshift but not switch back to live (not used in e2.. but usable for external plugins) this fixes bug #411 --- lib/service/servicedvb.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/service/servicedvb.cpp') diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index 615329c9..25e723ed 100644 --- 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; -- cgit v1.2.3 From c169f2ae453239e79e1725b2256191e9c729a559 Mon Sep 17 00:00:00 2001 From: ghost Date: Fri, 22 Jan 2010 15:37:36 +0100 Subject: servicedvb.cpp: compile fix for bug 411 --- lib/service/servicedvb.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/service/servicedvb.cpp') diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index 25e723ed..1df4e639 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -2089,7 +2089,7 @@ RESULT eDVBServicePlay::startTimeshift() return 0; } -RESULT eDVBServicePlay::stopTimeshift(bool switchToLive=true) +RESULT eDVBServicePlay::stopTimeshift(bool switchToLive) { if (!m_timeshift_enabled) return -1; -- cgit v1.2.3 From 83a674f998012f616a3ed7e7b7043e498fd93e09 Mon Sep 17 00:00:00 2001 From: ghost Date: Fri, 22 Jan 2010 17:23:03 +0100 Subject: another compile fix for bug #411 --- lib/service/iservice.h | 2 +- lib/service/servicedvb.cpp | 4 ++-- lib/service/servicedvb.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/service/servicedvb.cpp') diff --git a/lib/service/iservice.h b/lib/service/iservice.h index 8b64f166..c35313f0 100644 --- 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(bool switchToLive=true)=0; + virtual RESULT stopTimeshift(bool swToLive=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 1df4e639..9f10644c 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -2089,12 +2089,12 @@ RESULT eDVBServicePlay::startTimeshift() return 0; } -RESULT eDVBServicePlay::stopTimeshift(bool switchToLive) +RESULT eDVBServicePlay::stopTimeshift(bool swToLive) { if (!m_timeshift_enabled) return -1; - if (switchToLive) + if (swToLive) switchToLive(); m_timeshift_enabled = 0; diff --git a/lib/service/servicedvb.h b/lib/service/servicedvb.h index 6ab3b347..1262836e 100644 --- a/lib/service/servicedvb.h +++ b/lib/service/servicedvb.h @@ -159,7 +159,7 @@ public: // iTimeshiftService RESULT startTimeshift(); - RESULT stopTimeshift(bool switchToLive=true); + RESULT stopTimeshift(bool swToLive=true); int isTimeshiftActive(); RESULT activateTimeshift(); -- cgit v1.2.3