def cached(f):
name = f.__name__
def wrapper(self):
- if self.cache is None:
+ cache = self.cache
+ if cache is None:
return f(self)
- if name not in self.cache:
- self.cache[name] = (True, f(self))
- return self.cache[name][1]
+ if name not in cache:
+ cache[name] = (True, f(self))
+ return cache[name][1]
return wrapper
class Element(object):
def event_callback(self, ev):
# loop up if we need to handle this event
- if self.eventmap.has_key(ev):
+ func = self.eventmap.get(ev)
+ if func:
# call handler
if self.with_event:
- self.eventmap[ev](ev)
+ func(ev)
else:
- self.eventmap[ev]()
+ func()
def enablePolling(self, interval=60000):
if interval:
VariableText.__init__(self)
PerServiceBase.__init__(self, navcore, eventmap)
+ def destroy(self):
+ PerServiceBase.destroy(self)
+ GUIComponent.destroy(self)
+
GUI_WIDGET = eLabel
class PerServiceDisplayProgress(PerServiceBase, VariableValue, GUIComponent):
self.event(iPlayableService.evEnd)
GUI_WIDGET = eSlider
+
+ def destroy(self):
+ PerServiceBase.destroy(self)
+ GUIComponent.destroy(self)
self.screen.session.nav.event.remove(self.__event)
def __event(self, ev):
- set = ServiceEventTracker
- screen = self.screen
- nav = screen.session.nav
- cur_ref = nav.getCurrentlyPlayingServiceReference()
- old_service_running = set.oldRef and cur_ref and cur_ref == set.oldRef and set.oldService and set.oldService == str(nav.getCurrentService())
- if not old_service_running:
- set.oldService = None
- set.oldRef = None
+ func = self.__eventmap.get(ev)
+ if func:
+ set = ServiceEventTracker
+ screen = self.screen
+ nav = screen.session.nav
+ cur_ref = nav.getCurrentlyPlayingServiceReference()
+ old_service_running = set.oldRef and cur_ref and cur_ref == set.oldRef and set.oldService and set.oldService == str(nav.getCurrentService())
+ if not old_service_running:
+ set.oldService = None
+ set.oldRef = None
# print "old_service_running", old_service_running
- if ev in self.__eventmap:
ssize = set.InfoBarStackSize
stack = set.InfoBarStack
if (not isinstance(screen, InfoBarBase) or # let pass all events to screens not derived from InfoBarBase
(not old_service_running and ssize and stack[ssize-1] == screen) or # let pass events from currently running service just to current active screen (derived from InfoBarBase)
(old_service_running and ssize > 1 and stack[ssize-2] == screen)): # let pass events from old running service just to previous active screen (derived from InfoBarBase)
- self.__eventmap[ev]()
+ func()
# else:
# print "ignore event", ev, "for inactive infobar '" + str(self.screen) + "'"
self.instance.setSeekPosition(pos)
seek_pointer_position = property(getSeekPosition, setSeekPosition)
+
+ def destroy(self):
+ PerServiceBase.destroy(self)
+ GUIComponent.destroy(self)
def destroy(self):
if self.poll_timer:
self.poll_timer.callback.remove(self.poll)
+ Source.destroy(self)
def destroy(self):
self.clock_timer.callback.remove(self.poll)
+ Source.destroy(self)
return self.navcore.getCurrentService()
service = property(getCurrentService)
+
+ def destroy(self):
+ PerServiceBase.destroy(self)
+ Source.destroy(self)
+
self.changed((self.CHANGED_CLEAR,))
else:
self.changed((self.CHANGED_ALL,))
+
+ def destroy(self):
+ PerServiceBase.destroy(self)
+ Source.destroy(self)
+
+from enigma import iPlayableService
from Source import Source
+from Components.PerServiceDisplay import PerServiceBase
-class FrontendInfo(Source):
- def __init__(self, service_source = None, frontend_source = None):
+class FrontendInfo(Source, PerServiceBase):
+ def __init__(self, service_source = None, frontend_source = None, navcore = None):
+ self.navcore = None
Source.__init__(self)
+ if navcore:
+ PerServiceBase.__init__(self, navcore,
+ {
+ iPlayableService.evTunedIn: self.updateFrontendData,
+ iPlayableService.evEnd: self.serviceEnd
+ })
self.service_source = service_source
self.frontend_source = frontend_source
self.updateFrontendData()
+ def serviceEnd(self):
+# import pdb
+# pdb.set_trace()
+ self.slot_number = self.frontend_type = None
+ self.changed((self.CHANGED_CLEAR, ))
+
def updateFrontendData(self):
data = self.getFrontendData()
if not data:
frontend.getFrontendData(dict)
return dict
elif self.service_source:
- service = self.service_source()
+ service = self.navcore and self.service_source()
+ feinfo = service and service.frontendInfo()
+ return feinfo and feinfo.getFrontendData()
+ elif self.navcore:
+ service = self.navcore.getCurrentService()
feinfo = service and service.frontendInfo()
return feinfo and feinfo.getFrontendData()
else:
return None
+
+ def destroy(self):
+ if not self.frontend_source and not self.service_source:
+ PerServiceBase.destroy(self)
+ Source.destroy(self)
def destroy(self):
self.poll_timer.callback.remove(self.updateFrontendStatus)
+ Source.destroy(self)
self.changed((self.CHANGED_CLEAR,))
else:
self.changed((self.CHANGED_SPECIFIC, what))
+
+ def destroy(self):
+ PerServiceBase.destroy(self)
+ Source.destroy(self)
}, -1)
self["SubserviceQuickzapAction"].setEnabled(False)
- self.session.nav.event.append(self.checkSubservicesAvail) # we like to get service events
+ self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
+ {
+ iPlayableService.evUpdatedInfo: self.checkSubservicesAvail
+ })
self.bsel = None
- def checkSubservicesAvail(self, ev):
- if ev == iPlayableService.evUpdatedEventInfo:
- service = self.session.nav.getCurrentService()
- subservices = service and service.subServices()
- if not subservices or subservices.getNumberOfSubservices() == 0:
- self["SubserviceQuickzapAction"].setEnabled(False)
+ def checkSubservicesAvail(self):
+ service = self.session.nav.getCurrentService()
+ subservices = service and service.subServices()
+ if not subservices or subservices.getNumberOfSubservices() == 0:
+ self["SubserviceQuickzapAction"].setEnabled(False)
def nextSubservice(self):
self.changeSubservice(+1)
x()
def execEnd(self):
+ active_components = self.active_components
# for (name, val) in self.items():
- for val in self.active_components:
+ self.active_components = None
+ for val in active_components:
val.execEnd()
- del self.active_components
# assert self.session != None, "execEnd on non-execing screen!"
# self.session = None
self.execing = False
-from enigma import iPlayableService
from Screens.Screen import Screen
from Components.Sources.CurrentService import CurrentService
from Components.Sources.EventInfo import EventInfo
self["Event_Now"] = EventInfo(session.nav, EventInfo.NOW)
self["Event_Next"] = EventInfo(session.nav, EventInfo.NEXT)
self["FrontendStatus"] = FrontendStatus(service_source = session.nav.getCurrentService)
- self["FrontendInfo"] = FrontendInfo(service_source = session.nav.getCurrentService)
+ self["FrontendInfo"] = FrontendInfo(navcore = session.nav)
self["VideoPicture"] = Source()
self["TunerInfo"] = TunerInfo()
self["RecordState"] = RecordState(session)
- session.nav.event.append(self.serviceEvent)
- self.service_state = 0
-
FrontpanelLed().connect(self["RecordState"])
-
- def serviceEvent(self, evt):
- if evt == iPlayableService.evStart:
- self.service_state = 1
- elif evt == iPlayableService.evEnd:
- self.service_state = 0
- elif evt == iPlayableService.evUpdatedInfo and self.service_state == 1:
- self.service_state = 2
- self["FrontendInfo"].updateFrontendData()
git.cweiske.de / enigma2.git / commitdiff