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

diff --git a/Navigation.py b/Navigation.py
index 9c207036..e65edbb2 100644
--- a/Navigation.py
+++ b/Navigation.py
@@ -19,16 +19,24 @@ class Navigation:
 		self.pnav = pNavigation()
 		self.pnav.m_event.get().append(self.callEvent)
 		self.event = [ ]
+		self.currentlyPlayingServiceReference = 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):
+		print "playing", ref.toString()
 		self.currentlyPlayingServiceReference = None
+		self.currentlyPlayingService = None
+		if ref is None:
+			self.stopService()
+			return 0
+		
 		if not self.pnav.playService(ref):
 			self.currentlyPlayingServiceReference = ref
 			return 0
@@ -48,36 +56,31 @@ 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)
 	
-	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()