X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/67b53c1cb06988394c35a6e965c99b72b67fe1be..4c1d3d2f5cf39f72bf85041a6ba6665350ea742e:/lib/python/Components/ServiceEventTracker.py

diff --git a/lib/python/Components/ServiceEventTracker.py b/lib/python/Components/ServiceEventTracker.py
index 20460436..ee4bf381 100644
--- a/lib/python/Components/ServiceEventTracker.py
+++ b/lib/python/Components/ServiceEventTracker.py
@@ -1,15 +1,80 @@
+class InfoBarBase:
+	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):
+		ServiceEventTracker.popActiveInfoBar()
+
 class ServiceEventTracker:
 	"""Tracks service events into a screen"""
-	
+	InfoBarStack = [ ]
+	InfoBarStackSize = 0
+	oldServiceStr = None
+	EventMap = { }
+	navcore = None
+
+	@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.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, 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
+#		print "ServiceEventTracker set active '" + str(infobar) + "'"
+
+	@staticmethod
+	def popActiveInfoBar():
+		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.session = screen.session
-		self.session.nav.event.append(self.__event)
+		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):
-		self.session.nav.event.remove(self.__event)
-
-	def __event(self, ev):
-		if ev in self.__eventmap:
-			self.__eventmap[ev]()
+		EventMap = ServiceEventTracker.EventMap.setdefault
+		for x in self.__eventmap.iteritems():
+			EventMap(x[0], []).remove((self.__passall, self.__screen, x[1]))