X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/53893eb6396db5d48c105d09128baff79db4c9cc..ddb902bb5534e88375cd37845b19505c91c6a58b:/Navigation.py diff --git a/Navigation.py b/Navigation.py index b71c93c5..7c1cdd42 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,30 +17,38 @@ class Navigation: NavigationInstance.instance = self self.ServiceHandler = eServiceCenter.getInstance() - print self.ServiceHandler - + 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() - + self.SleepTimer = SleepTimer.SleepTimer() + def callEvent(self, i): + self.state = i != 1 for x in self.event: x(i) - - def playService(self, ref): + + def playService(self, ref, checkParentalControl = True): + 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.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): @@ -45,41 +58,42 @@ class Navigation: print "recording service: %s" % (str(ref)) if isinstance(ref, ServiceReference.ServiceReference): ref = ref.ref - service = self.pnav.recordService(ref) + 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 = self.pnav.getCurrentService() - - if service is None: - 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()