X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=Navigation.py;h=d8a98b12e59aad865c1b8ab0efa2ee4549c944fc;hb=834926ea17f0489f857e6cfbd886171740928d6f;hp=6934f11f4a316b459e6c5aaa96eba04af9efc031;hpb=878c28f3ac56f6dce9647993278e36cacb994bcc;p=vuplus_dvbapp

diff --git a/Navigation.py b/Navigation.py
index 6934f11..d8a98b1 100644
--- a/Navigation.py
+++ b/Navigation.py
@@ -20,6 +20,8 @@ class Navigation:
 		self.pnav.m_event.get().append(self.callEvent)
 		self.event = [ ]
 		self.currentlyPlayingService = None
+		self.currentlyPlayingServiceReference = None
+		self.lastServiceRef = None
 		
 		self.RecordTimer = RecordTimer.RecordTimer()
 
@@ -28,12 +30,20 @@ class Navigation:
 			x(i)
 	
 	def playService(self, ref):
+		self.lastServiceRef = self.currentlyPlayingServiceReference
 		self.currentlyPlayingServiceReference = None
+		if ref is None:
+			self.stopService()
+			return 0
+		
 		if not self.pnav.playService(ref):
 			self.currentlyPlayingServiceReference = ref
 			return 0
 		return 1
 	
+	def zapLast(self):
+		return self.playService(self.lastServiceRef)
+	
 	def getCurrentlyPlayingServiceReference(self):
 		return self.currentlyPlayingServiceReference
 	
@@ -60,6 +70,9 @@ class Navigation:
 		
 		return service
 	
+	def stopService(self):
+		self.pnav.stopService()
+	
 	def getPlaylist(self):
 		playlist = ePlaylistPtr()
 		if self.pnav.getPlaylist(playlist):
@@ -69,12 +82,15 @@ class Navigation:
 	def pause(self, p):
 		return self.pnav.pause(p)
 	
-	def recordWithTimer(self, begin, end, ref, epg, description):
+	def recordWithTimer(self, ref, begin, end, name, description, eit):
 		if isinstance(ref, eServiceReference):
 			ref = ServiceReference.ServiceReference(ref)
-		entry = RecordTimer.RecordTimerEntry(begin, end, ref, epg, description)
+		entry = RecordTimer.RecordTimerEntry(ref, begin, end, name, description, eit)
 		self.RecordTimer.record(entry)
 		return entry
 	
 	def shutdown(self):
 		self.RecordTimer.shutdown()
+
+	def stopUserServices(self):
+		self.stopService()