X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1889fbce45ea5471d15f95c04594d9aa2a429120..92929c357751afc31f7f1acbe3e724bdf307cf23:/lib/python/Components/PerServiceDisplay.py

diff --git a/lib/python/Components/PerServiceDisplay.py b/lib/python/Components/PerServiceDisplay.py
index 500538c3..25a296f9 100644
--- a/lib/python/Components/PerServiceDisplay.py
+++ b/lib/python/Components/PerServiceDisplay.py
@@ -1,30 +1,52 @@
-from GUIComponent import *
-from VariableText import *
-from VariableValue import *
+from GUIComponent import GUIComponent
+from VariableText import VariableText
+from VariableValue import VariableValue
 
 from enigma import iPlayableService
 from enigma import eLabel, eSlider, eTimer
 
+
 class PerServiceBase(object):
-	def __init__(self, navcore, eventmap):
-		self.eventmap = eventmap
+	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.navcore = navcore
-		self.navcore.event.append(self.event)
+		self.eventmap = eventmap
 		self.poll_timer = eTimer()
-		self.poll_timer.timeout.get().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(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)
+		EventMap = PerServiceBase.EventMap.setdefault
+		for x in self.eventmap.iteritems():
+			EventMap(x[0], []).remove((self.with_event, x[1]))
 
-	def event(self, ev):
-		# loop up if we need to handle this event
-		if self.eventmap.has_key(ev):
-			# call handler
-			self.eventmap[ev]()
-	
 	def enablePolling(self, interval=60000):
 		if interval:
 			self.poll_timer.start(interval)
@@ -44,12 +66,17 @@ class PerServiceDisplay(PerServiceBase, VariableText, GUIComponent):
 		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):
 	def __init__(self, navcore, eventmap):
 		GUIComponent.__init__(self)
 		VariableValue.__init__(self)
+		PerServiceBase.__init__(self, navcore, eventmap)
 		self.eventmap = eventmap
 		self.navcore = navcore
 		self.navcore.event.append(self.event)
@@ -58,3 +85,7 @@ class PerServiceDisplayProgress(PerServiceBase, VariableValue, GUIComponent):
 		self.event(iPlayableService.evEnd)
 
 	GUI_WIDGET = eSlider
+
+	def destroy(self):
+		PerServiceBase.destroy(self)
+		GUIComponent.destroy(self)