X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/cc5126538b58123908717b37816968071d603eb5..d65ce06bfed2444d9870630f095db401d78a096e:/lib/python/Components/PerServiceDisplay.py

diff --git a/lib/python/Components/PerServiceDisplay.py b/lib/python/Components/PerServiceDisplay.py
index a36d4a60..6e02cce9 100644
--- a/lib/python/Components/PerServiceDisplay.py
+++ b/lib/python/Components/PerServiceDisplay.py
@@ -1,6 +1,6 @@
-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
@@ -9,18 +9,18 @@ class PerServiceBase(object):
 	def __init__(self, navcore, eventmap, with_event=False):
 		self.eventmap = eventmap
 		self.navcore = navcore
-		self.navcore.event.append(self.event)
+		self.navcore.event.append(self.event_callback)
 		self.poll_timer = eTimer()
 		self.poll_timer.timeout.get().append(self.poll)
 		self.with_event = with_event
 		
 		# start with stopped state, so simulate that
-		self.event(iPlayableService.evEnd)
+		self.event_callback(iPlayableService.evEnd)
 
 	def destroy(self):
-		self.navcore.event.remove(self.event)
+		self.navcore.event.remove(self.event_callback)
 
-	def event(self, ev):
+	def event_callback(self, ev):
 		# loop up if we need to handle this event
 		if self.eventmap.has_key(ev):
 			# call handler
@@ -54,6 +54,7 @@ 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)