X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/53893eb6396db5d48c105d09128baff79db4c9cc..6f43d8cd46f2f30f615e6105e78b35a0297f0ffe:/Navigation.py

diff --git a/Navigation.py b/Navigation.py
index b71c93c5..09daff34 100644
--- a/Navigation.py
+++ b/Navigation.py
@@ -12,18 +12,15 @@ class Navigation:
 		
 		NavigationInstance.instance = self
 		self.ServiceHandler = eServiceCenter.getInstance()
-		print self.ServiceHandler
 
 		import Navigation as Nav
 		Nav.navcore = self
 		
-		print "Navcore instance set!"
-		print Nav.navcore
-		
 		self.pnav = pNavigation()
 		self.pnav.m_event.get().append(self.callEvent)
 		self.event = [ ]
 		self.currentlyPlayingService = None
+		self.currentlyPlayingServiceReference = None
 		
 		self.RecordTimer = RecordTimer.RecordTimer()
 
@@ -33,6 +30,10 @@ class Navigation:
 	
 	def playService(self, ref):
 		self.currentlyPlayingServiceReference = None
+		if ref is None:
+			self.stopService()
+			return 0
+		
 		if not self.pnav.playService(ref):
 			self.currentlyPlayingServiceReference = ref
 			return 0
@@ -51,7 +52,6 @@ class Navigation:
 			print "record returned non-zero"
 			return None
 		else:
-			print "ok, recordService didn't fail"
 			return service
 	
 	def enqueueService(self, ref):
@@ -65,6 +65,9 @@ class Navigation:
 		
 		return service
 	
+	def stopService(self):
+		self.pnav.stopService()
+	
 	def getPlaylist(self):
 		playlist = ePlaylistPtr()
 		if self.pnav.getPlaylist(playlist):
@@ -83,3 +86,6 @@ class Navigation:
 	
 	def shutdown(self):
 		self.RecordTimer.shutdown()
+
+	def stopUserServices(self):
+		self.stopService()