From f21ed7557f028e334810bf1094251f93520dce2a Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Fri, 27 Jun 2008 20:42:11 +0000 Subject: [PATCH] rewrite ServiceEventTracker and PerServiceBase service event handle code (now the real code) --- lib/python/Components/PerServiceDisplay.py | 51 +++++++++++------ lib/python/Components/ServiceEventTracker.py | 58 ++++++++++++-------- 2 files changed, 69 insertions(+), 40 deletions(-) diff --git a/lib/python/Components/PerServiceDisplay.py b/lib/python/Components/PerServiceDisplay.py index cb86bd84..25a296f9 100644 --- a/lib/python/Components/PerServiceDisplay.py +++ b/lib/python/Components/PerServiceDisplay.py @@ -5,31 +5,48 @@ from VariableValue import VariableValue from enigma import iPlayableService from enigma import eLabel, eSlider, eTimer + class PerServiceBase(object): + EventMap = { } + + @staticmethod + def event(ev): + func_list = PerServiceBase.EventMap.setdefault(ev, []) + for func in func_list: + if func[0]: # with_event + func[1](ev) + else: + func[1]() + def __init__(self, navcore, eventmap, with_event=False): - self.eventmap = eventmap self.navcore = navcore - self.navcore.event.append(self.event_callback) + self.eventmap = eventmap self.poll_timer = eTimer() - self.poll_timer.callback.append(self.poll) self.with_event = with_event - + + self.poll_timer.callback.append(self.poll) + + EventMap = PerServiceBase.EventMap + if not len(EventMap): + self.navcore.event.append(PerServiceBase.event) + + EventMap = EventMap.setdefault + for x in eventmap.iteritems(): + EventMap(x[0], []).append((with_event, x[1])) + # start with stopped state, so simulate that - self.event_callback(iPlayableService.evEnd) + evEndEntry = eventmap.get(iPlayableService.evEnd) + if evEndEntry: + if with_event: + evEndEntry(iPlayableService.evEnd) + else: + evEndEntry() def destroy(self): - self.navcore.event.remove(self.event_callback) - - def event_callback(self, ev): - # loop up if we need to handle this event - func = self.eventmap.get(ev) - if func: - # call handler - if self.with_event: - func(ev) - else: - func() - + EventMap = PerServiceBase.EventMap.setdefault + for x in self.eventmap.iteritems(): + EventMap(x[0], []).remove((self.with_event, x[1])) + def enablePolling(self, interval=60000): if interval: self.poll_timer.start(interval) diff --git a/lib/python/Components/ServiceEventTracker.py b/lib/python/Components/ServiceEventTracker.py index 265d566e..164f6888 100644 --- a/lib/python/Components/ServiceEventTracker.py +++ b/lib/python/Components/ServiceEventTracker.py @@ -15,36 +15,30 @@ class ServiceEventTracker: InfoBarStack = [ ] InfoBarStackSize = 0 oldService = None + EventMap = { } + navcore = None - def __init__(self, screen, eventmap): - self.__eventmap = eventmap - self.screen = screen - screen.session.nav.event.append(self.__event) - screen.onClose.append(self.__del_event) - - def __del_event(self): - self.screen.session.nav.event.remove(self.__event) - - def __event(self, ev): - func = self.__eventmap.get(ev) - if func: - set = ServiceEventTracker - screen = self.screen - nav = screen.session.nav + @staticmethod + def event(evt): + set = ServiceEventTracker + func_list = set.EventMap.setdefault(evt, []) + if func_list: + nav = set.navcore 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: +# print "old_service_running", old_service_running + if not old_service_running and set.oldService: set.oldService = None set.oldRef = None -# print "old_service_running", old_service_running 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) - func() -# else: -# print "ignore event", ev, "for inactive infobar '" + str(self.screen) + "'" + for func in func_list: + if (func[0] or # let pass all events to screens not derived from InfoBarBase + (not old_service_running and stack[ssize-1] == func[1]) 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] == func[1])): # let pass events from old running service just to previous active screen (derived from InfoBarBase) + func[2]() +# else: +# print "ignore event", ev, "for inactive infobar '" + str(self.screen) + "'" @staticmethod def setActiveInfoBar(infobar, old_service, old_ref): @@ -65,3 +59,21 @@ class ServiceEventTracker: del stack[set.InfoBarStackSize] # if set.InfoBarStackSize: # print "ServiceEventTracker reset active '" + str(stack[set.InfoBarStackSize-1]) + "'" + + def __init__(self, screen, eventmap): + self.__screen = screen + self.__eventmap = eventmap + self.__passall = not isinstance(screen, InfoBarBase) # let pass all events to screens not derived from InfoBarBase + EventMap = ServiceEventTracker.EventMap + if not len(EventMap): + screen.session.nav.event.append(ServiceEventTracker.event) + ServiceEventTracker.navcore = screen.session.nav + EventMap = EventMap.setdefault + for x in eventmap.iteritems(): + EventMap(x[0], []).append((self.__passall, screen, x[1])) + screen.onClose.append(self.__del_event) + + def __del_event(self): + EventMap = ServiceEventTracker.EventMap.setdefault + for x in self.__eventmap.iteritems(): + EventMap(x[0], []).remove((self.__passall, self.__screen, x[1])) -- 2.30.2