X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=Navigation.py;h=8ff1be0cc3d7327f94817b53b434fb836c9f44a5;hb=c1742b2d2c072ddd0e3ceb4b2227120cd308a278;hp=9c20703668b782d8e58070a61722ea0940c536ee;hpb=1ffc0bf038880f0928f545539c738ce81a9687a1;p=vuplus_dvbapp

diff --git a/Navigation.py b/Navigation.py
index 9c20703..8ff1be0 100644
--- a/Navigation.py
+++ b/Navigation.py
@@ -20,6 +20,7 @@ class Navigation:
 		self.pnav.m_event.get().append(self.callEvent)
 		self.event = [ ]
 		self.currentlyPlayingService = None
+		self.currentlyPlayingServiceReference = None
 		
 		self.RecordTimer = RecordTimer.RecordTimer()
 
@@ -28,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
@@ -49,9 +55,6 @@ class Navigation:
 		else:
 			return service
 	
-	def enqueueService(self, ref):
-		return self.pnav.enqueueService(ref)
-	
 	def getCurrentService(self):
 		service = self.pnav.getCurrentService()
 		
@@ -63,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()