fixes bug #429

[enigma2.git] / lib / python / Components / ServiceEventTracker.py

diff --git a/lib/python/Components/ServiceEventTracker.py b/lib/python/Components/ServiceEventTracker.py
index 89c339f8543b7e9bdacf389dd03b5f2936d3bf46..ee4bf3817650b3c79c2cddcfb013ab65303df78b 100644 (file)
--- a/lib/python/Components/ServiceEventTracker.py
+++ b/lib/python/Components/ServiceEventTracker.py
@@ -1,6 +1,10 @@
 class InfoBarBase:
-       def __init__(self):
-               ServiceEventTracker.setActiveInfoBar(self)
+       def __init__(self, steal_current_service = False):
+               if steal_current_service:
+                       ServiceEventTracker.setActiveInfoBar(self, None, None)
+               else:
+                       nav = self.session.nav
+                       ServiceEventTracker.setActiveInfoBar(self, not steal_current_service and nav.getCurrentService(), nav.getCurrentlyPlayingServiceReference())
                self.onClose.append(self.__close)
 
        def __close(self):
@@ -10,29 +14,34 @@ class ServiceEventTracker:
        """Tracks service events into a screen"""
        InfoBarStack = [ ]
        InfoBarStackSize = 0
+       oldServiceStr = 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):
+       @staticmethod
+       def event(evt):
                set = ServiceEventTracker
-               ssize = set.InfoBarStackSize
-               stack = set.InfoBarStack
-               if ev in self.__eventmap:
-                       if not isinstance(self.screen, InfoBarBase) or (ssize and stack[ssize-1] == self.screen):
-                               self.__eventmap[ev]()
-#                      else:
-#                              print "ignore event", ev, "for inactive infobar '" + str(self.screen) + "'"
+               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.oldServiceStr == nav.getCurrentService().getPtrString()
+                       if not old_service_running and set.oldServiceStr:
+                               set.oldServiceStr = None
+                               set.oldRef = None
+                       ssize = set.InfoBarStackSize
+                       stack = set.InfoBarStack
+                       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]()
 
        @staticmethod
-       def setActiveInfoBar(infobar):
+       def setActiveInfoBar(infobar, old_service, old_ref):
                set = ServiceEventTracker
+               set.oldRef = old_ref
+               set.oldServiceStr = old_service and old_service.getPtrString()
                assert infobar not in set.InfoBarStack, "FATAL: Infobar '" + str(infobar) + "' is already active!"
                set.InfoBarStack.append(infobar)
                set.InfoBarStackSize += 1
@@ -43,7 +52,29 @@ class ServiceEventTracker:
                set = ServiceEventTracker
                stack = set.InfoBarStack
                if set.InfoBarStackSize:
+                       nav = set.navcore
                        set.InfoBarStackSize -= 1
                        del stack[set.InfoBarStackSize]
+                       old_service = nav.getCurrentService()
+                       set.oldServiceStr = old_service and old_service.getPtrString()
+                       set.oldRef = nav.getCurrentlyPlayingServiceReference()
 #                      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]))