X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/6be79966e8e631b8ad50a5404f0f938d200c2a41..120bcf9214b7624886d07c2832060222551d2da1:/Navigation.py

diff --git a/Navigation.py b/Navigation.py
index 7c1cdd42..7b1deb03 100644
--- a/Navigation.py
+++ b/Navigation.py
@@ -1,4 +1,4 @@
-from enigma import *
+from enigma import eServiceCenter, eServiceReference, pNavigation, getBestPlayableServiceReference
 from Components.ParentalControl import parentalControl
 from Tools.BoundFunction import boundFunction
 import RecordTimer
@@ -7,8 +7,6 @@ import SleepTimer
 import NavigationInstance
 import ServiceReference
 
-from time import time
-
 # TODO: remove pNavgation, eNavigation and rewrite this stuff in python.
 class Navigation:
 	def __init__(self):
@@ -22,30 +20,47 @@ class Navigation:
 		Nav.navcore = self
 		
 		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.state = 0
 		self.RecordTimer = RecordTimer.RecordTimer()
 		self.SleepTimer = SleepTimer.SleepTimer()
-		
-	def callEvent(self, i):
-		self.state = i != 1
+
+	def dispatchEvent(self, i):
 		for x in self.event:
 			x(i)
 
+	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
 		self.currentlyPlayingService = None
 		if ref is None:
 			self.stopService()
 			return 0
-		
-		if not checkParentalControl or parentalControl.isServicePlayable(ref.toCompareString(), boundFunction(self.playService, checkParentalControl = False)):
-			if self.pnav and not self.pnav.playService(ref):
-				self.currentlyPlayingServiceReference = ref
+		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()
@@ -55,23 +70,29 @@ class Navigation:
 		return self.currentlyPlayingServiceReference
 	
 	def recordService(self, ref):
+		service = None
 		print "recording service: %s" % (str(ref))
 		if isinstance(ref, ServiceReference.ServiceReference):
 			ref = ref.ref
-		service = self.pnav and self.pnav.recordService(ref)
-		
-		if service is None:
-			print "record returned non-zero"
-			return None
-		else:
-			return service
+		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 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 self.state:
-			if not self.currentlyPlayingService:
-				self.currentlyPlayingService = self.pnav and self.pnav.getCurrentService()
-			return self.currentlyPlayingService
-		return None
+		if not self.currentlyPlayingService:
+			self.currentlyPlayingService = self.pnav and self.pnav.getCurrentService()
+		return self.currentlyPlayingService
 
 	def stopService(self):
 		print "stopService"