X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0056054b80fede7d4c92f83033ba33159ea861ef..da54ea206b908d0ab08f7e8c61466c5fe6180540:/Navigation.py

diff --git a/Navigation.py b/Navigation.py
index a0f40baf..f8c84173 100644
--- a/Navigation.py
+++ b/Navigation.py
@@ -1,9 +1,13 @@
 from enigma import *
+from Components.ParentalControl import parentalControl
+from Tools.BoundFunction import boundFunction
 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):
@@ -12,7 +16,7 @@ class Navigation:
 		
 		NavigationInstance.instance = self
 		self.ServiceHandler = eServiceCenter.getInstance()
-
+		
 		import Navigation as Nav
 		Nav.navcore = self
 		
@@ -23,23 +27,26 @@ class Navigation:
 		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.toString()
+	def playService(self, ref, checkParentalControl = True):
+		print "playing", ref and ref.toString()
 		self.currentlyPlayingServiceReference = None
 		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
+		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
+				return 0
+		else:
+			self.stopService()
 		return 1
 	
 	def getCurrentlyPlayingServiceReference(self):
@@ -65,6 +72,7 @@ class Navigation:
 		return None
 
 	def stopService(self):
+		print "stopService"
 		if self.pnav:
 			self.pnav.stopService()
 		self.currentlyPlayingService = None