X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/094b454c7e3b86cdcff697bb68cd367e53ba9e8e..88f345d258e900ca764a9e97f66394e29c2be5ba:/Navigation.py

diff --git a/Navigation.py b/Navigation.py
index 5fe26517..7b615bbd 100644
--- a/Navigation.py
+++ b/Navigation.py
@@ -4,6 +4,8 @@ import RecordTimer
 import NavigationInstance
 import ServiceReference
 
+from time import time
+
 # TODO: remove pNavgation, eNavigation and rewrite this stuff in python.
 class Navigation:
 	def __init__(self):
@@ -11,29 +13,33 @@ class Navigation:
 			raise NavigationInstance.instance
 		
 		NavigationInstance.instance = self
-		self.ServiceHandler = eServiceCenterPtr()
-		eServiceCenter.getInstance(self.ServiceHandler)
+		self.ServiceHandler = eServiceCenter.getInstance()
 
 		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.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 and ref.toString()
 		self.currentlyPlayingServiceReference = None
-		if not self.pnav.playService(ref):
+		self.currentlyPlayingService = None
+		if ref is None:
+			self.stopService()
+			return 0
+		
+		if self.pnav and not self.pnav.playService(ref):
 			self.currentlyPlayingServiceReference = ref
 			return 0
 		return 1
@@ -45,38 +51,42 @@ class Navigation:
 		print "recording service: %s" % (str(ref))
 		if isinstance(ref, ServiceReference.ServiceReference):
 			ref = ref.ref
-		service = iRecordableServicePtr()
-		if self.pnav.recordService(ref, service):
+		service = self.pnav and self.pnav.recordService(ref)
+		
+		if service is None:
 			print "record returned non-zero"
 			return None
 		else:
-			print "ok, recordService didn't fail"
 			return service
-	
-	def enqueueService(self, ref):
-		return self.pnav.enqueueService(ref)
-	
+
 	def getCurrentService(self):
-		service = iPlayableServicePtr()
-		if self.pnav.getCurrentService(service):
-			return None
-		return service
-	
-	def getPlaylist(self):
-		playlist = ePlaylistPtr()
-		if self.pnav.getPlaylist(playlist):
-			return None
-		return playlist
-	
+		if self.state:
+			if not self.currentlyPlayingService:
+				self.currentlyPlayingService = self.pnav and self.pnav.getCurrentService()
+			return self.currentlyPlayingService
+		return None
+
+	def stopService(self):
+		print "stopService"
+		if self.pnav:
+			self.pnav.stopService()
+		self.currentlyPlayingService = None
+		self.currentlyPlayingServiceReference = None
+
 	def pause(self, p):
-		return self.pnav.pause(p)
-	
-	def recordWithTimer(self, begin, end, ref, epg, description):
+		return self.pnav and self.pnav.pause(p)
+
+	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()
+		self.ServiceHandler = None
+		self.pnav = None
+
+	def stopUserServices(self):
+		self.stopService()