X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6e8738f7f86c2bd4263c99a0095dc1a071870dca..01897d6c61781861929b773238c8a6251df49629:/Navigation.py

diff --git a/Navigation.py b/Navigation.py
index 57c12839..7b1deb03 100644
--- a/Navigation.py
+++ b/Navigation.py
@@ -1,5 +1,8 @@
-from enigma import *
+from enigma import eServiceCenter, eServiceReference, pNavigation, getBestPlayableServiceReference
+from Components.ParentalControl import parentalControl
+from Tools.BoundFunction import boundFunction
 import RecordTimer
+import SleepTimer
 
 import NavigationInstance
 import ServiceReference
@@ -11,72 +14,107 @@ 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.pnav.m_event.get().append(self.dispatchEvent)
+		self.pnav.m_record_event.get().append(self.dispatchRecordEvent)
 		self.event = [ ]
+		self.record_event = [ ]
+		self.currentlyPlayingServiceReference = None
 		self.currentlyPlayingService = None
-		
 		self.RecordTimer = RecordTimer.RecordTimer()
+		self.SleepTimer = SleepTimer.SleepTimer()
 
-	def callEvent(self, i):
+	def dispatchEvent(self, i):
 		for x in self.event:
 			x(i)
-	
-	def playService(self, ref):
+
+	def dispatchRecordEvent(self, rec_service, event):
+#		print "record_event", rec_service, event
+		for x in self.record_event:
+			x(rec_service, event)
+
+	def playService(self, ref, checkParentalControl = True):
+		oldref = self.currentlyPlayingServiceReference
+		if ref and oldref and ref == oldref:
+			print "ignore request to play already running service"
+			return 0
+		print "playing", ref and ref.toString()
 		self.currentlyPlayingServiceReference = None
-		if not self.pnav.playService(ref):
-			self.currentlyPlayingServiceReference = ref
+		self.currentlyPlayingService = None
+		if ref is None:
+			self.stopService()
 			return 0
+		if not checkParentalControl or parentalControl.isServicePlayable(ref, boundFunction(self.playService, checkParentalControl = False)):
+			if ref.flags & eServiceReference.isGroup:
+				if not oldref:
+					oldref = eServiceReference()
+				playref = getBestPlayableServiceReference(ref, oldref)
+				if not playref or (checkParentalControl and not parentalControl.isServicePlayable(playref, boundFunction(self.playService, checkParentalControl = False))):
+					self.stopService()
+					return 0
+			else:
+				playref = ref
+			if self.pnav and not self.pnav.playService(playref):
+				self.currentlyPlayingServiceReference = playref
+				return 0
+		else:
+			self.stopService()
 		return 1
 	
 	def getCurrentlyPlayingServiceReference(self):
 		return self.currentlyPlayingServiceReference
 	
 	def recordService(self, ref):
+		service = None
 		print "recording service: %s" % (str(ref))
 		if isinstance(ref, ServiceReference.ServiceReference):
 			ref = ref.ref
-		service = iRecordableServicePtr()
-		if self.pnav.recordService(ref, service):
-			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
+		if ref:
+			if ref.flags & eServiceReference.isGroup:
+				ref = getBestPlayableServiceReference(ref, eServiceReference())
+			service = ref and self.pnav and self.pnav.recordService(ref)
+			if service is None:
+				print "record returned non-zero"
 		return service
-	
-	def getPlaylist(self):
-		playlist = ePlaylistPtr()
-		if self.pnav.getPlaylist(playlist):
-			return None
-		return playlist
-	
+
+	def stopRecordService(self, service):
+		ret = self.pnav and self.pnav.stopRecordService(service)
+		return ret
+
+	def getRecordings(self):
+		return self.pnav and self.pnav.getRecordings()
+
+	def getCurrentService(self):
+		if not self.currentlyPlayingService:
+			self.currentlyPlayingService = self.pnav and self.pnav.getCurrentService()
+		return self.currentlyPlayingService
+
+	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):
+		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)
+		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()