From: ghost <andreas.monzner@multimedia-labs.de>
Date: Fri, 22 Jan 2010 16:23:03 +0000 (+0100)
Subject: another compile fix for bug #411
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=83a674f998012f616a3ed7e7b7043e498fd93e09

another compile fix for bug #411
---

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index 8b64f16..c35313f 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 1df4e63..9f10644 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 6ab3b34..1262836 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();