X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/abf92f8e291a1b4515926085ef34f41362133217..1ea1344136bafa89159eacc25896d279dccda593:/Navigation.py

diff --git a/Navigation.py b/Navigation.py
index 7e7c0f21..8ff1be0c 100644
--- a/Navigation.py
+++ b/Navigation.py
@@ -29,7 +29,12 @@ class Navigation:
 			x(i)
 	
 	def playService(self, ref):
+		print "playing", ref
 		self.currentlyPlayingServiceReference = None
+		if ref is None:
+			self.stopService()
+			return 0
+		
 		if not self.pnav.playService(ref):
 			self.currentlyPlayingServiceReference = ref
 			return 0
@@ -50,9 +55,6 @@ class Navigation:
 		else:
 			return service
 	
-	def enqueueService(self, ref):
-		return self.pnav.enqueueService(ref)
-	
 	def getCurrentService(self):
 		service = self.pnav.getCurrentService()
 		
@@ -64,21 +66,19 @@ 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()
+		del self.pnav
+
+	def stopUserServices(self):
+		self.stopService()