X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7b46919af63cfcb6adbe72d8d4183a203dfcfce7..ec7c78fd405d7d6579eb40ac52a56e904ee1e21f:/Navigation.py

diff --git a/Navigation.py b/Navigation.py
index d8a98b12..e65edbb2 100644
--- a/Navigation.py
+++ b/Navigation.py
@@ -19,19 +19,20 @@ class Navigation:
 		self.pnav = pNavigation()
 		self.pnav.m_event.get().append(self.callEvent)
 		self.event = [ ]
-		self.currentlyPlayingService = None
 		self.currentlyPlayingServiceReference = None
-		self.lastServiceRef = None
-		
+		self.currentlyPlayingService = None
+		self.state = 0
 		self.RecordTimer = RecordTimer.RecordTimer()
 
 	def callEvent(self, i):
+		self.state = i != 1
 		for x in self.event:
 			x(i)
-	
+
 	def playService(self, ref):
-		self.lastServiceRef = self.currentlyPlayingServiceReference
+		print "playing", ref.toString()
 		self.currentlyPlayingServiceReference = None
+		self.currentlyPlayingService = None
 		if ref is None:
 			self.stopService()
 			return 0
@@ -41,9 +42,6 @@ class Navigation:
 			return 0
 		return 1
 	
-	def zapLast(self):
-		return self.playService(self.lastServiceRef)
-	
 	def getCurrentlyPlayingServiceReference(self):
 		return self.currentlyPlayingServiceReference
 	
@@ -58,27 +56,18 @@ class Navigation:
 			return None
 		else:
 			return service
-	
-	def enqueueService(self, ref):
-		return self.pnav.enqueueService(ref)
-	
+
 	def getCurrentService(self):
-		service = self.pnav.getCurrentService()
-		
-		if service is None:
-			return None
-		
-		return service
-	
+		if self.state:
+			if not self.currentlyPlayingService:
+				self.currentlyPlayingService = self.pnav.getCurrentService()
+			return self.currentlyPlayingService
+		return None
+
 	def stopService(self):
 		self.pnav.stopService()
-	
-	def getPlaylist(self):
-		playlist = ePlaylistPtr()
-		if self.pnav.getPlaylist(playlist):
-			return None
-		return playlist
-	
+		self.currentlyPlayingService = None
+
 	def pause(self, p):
 		return self.pnav.pause(p)
 	
@@ -91,6 +80,7 @@ class Navigation:
 	
 	def shutdown(self):
 		self.RecordTimer.shutdown()
+		del self.pnav
 
 	def stopUserServices(self):
 		self.stopService()