X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0056054b80fede7d4c92f83033ba33159ea861ef..f855bd5291c74d34668cdbb77e9c89c80f4a5dc9:/Navigation.py diff --git a/Navigation.py b/Navigation.py index a0f40baf..53e9ed42 100644 --- a/Navigation.py +++ b/Navigation.py @@ -1,9 +1,14 @@ from enigma import * +from Components.ParentalControl import parentalControl +from Tools.BoundFunction import boundFunction import RecordTimer +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): @@ -12,34 +17,45 @@ class Navigation: NavigationInstance.instance = self self.ServiceHandler = eServiceCenter.getInstance() - + import Navigation as Nav 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): + def dispatchEvent(self, i): self.state = i != 1 for x in self.event: x(i) - def playService(self, ref): - print "playing", ref.toString() + 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): + 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): @@ -57,6 +73,13 @@ class Navigation: else: 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: @@ -65,6 +88,7 @@ class Navigation: return None def stopService(self): + print "stopService" if self.pnav: self.pnav.stopService() self.currentlyPlayingService = None