X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1ffc0bf038880f0928f545539c738ce81a9687a1..7a0e4749e8bf580370bd23d9b450763d9e917909:/Navigation.py?ds=sidebyside

diff --git a/Navigation.py b/Navigation.py
index 9c207036..705083f6 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
 	
@@ -49,9 +59,6 @@ class Navigation:
 		else:
 			return service
 	
-	def enqueueService(self, ref):
-		return self.pnav.enqueueService(ref)
-	
 	def getCurrentService(self):
 		service = self.pnav.getCurrentService()
 		
@@ -63,21 +70,18 @@ class Navigation:
 	def stopService(self):
 		self.pnav.stopService()
 	
-	def getPlaylist(self):
-		playlist = ePlaylistPtr()
-		if self.pnav.getPlaylist(playlist):
-			return None
-		return playlist
-	
 	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()