X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3f0b490f6b5c5a4d83c1e2c1238d2eb33ff25a57..eb047f3299d45a434c6537ab01dfb3656f686f11:/lib/python/Components/ServiceEventTracker.py

diff --git a/lib/python/Components/ServiceEventTracker.py b/lib/python/Components/ServiceEventTracker.py
index 1c42ecc8..164f6888 100644
--- a/lib/python/Components/ServiceEventTracker.py
+++ b/lib/python/Components/ServiceEventTracker.py
@@ -15,35 +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):
+	@staticmethod
+	def event(evt):
 		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:
+		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())
+#			print "old_service_running", old_service_running
+			if not old_service_running and set.oldService:
+				set.oldService = None
+				set.oldRef = None
 			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]()
-#			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):
@@ -64,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]))