add missing base class initialization

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

diff --git a/lib/python/Components/PerServiceDisplay.py b/lib/python/Components/PerServiceDisplay.py
index 55ef3d18672509e756618b610a058a7fba24f7e5..6de7e8887600941d3566bc8f558d550bf4f8b7d7 100644 (file)
--- a/lib/python/Components/PerServiceDisplay.py
+++ b/lib/python/Components/PerServiceDisplay.py
@@ -5,23 +5,29 @@ from VariableValue import *
 from enigma import iPlayableService
 from enigma import eLabel, eSlider, eTimer
 
-class PerServiceBase(GUIComponent):
-       def __init__(self, navcore, eventmap):
-               GUIComponent.__init__(self)
+class PerServiceBase(object):
+       def __init__(self, navcore, eventmap, with_event=False):
                self.eventmap = eventmap
                self.navcore = navcore
                self.navcore.event.append(self.event)
                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)
 
+       def destroy(self):
+               self.navcore.event.remove(self.event)
+
        def event(self, ev):
                # loop up if we need to handle this event
                if self.eventmap.has_key(ev):
                        # call handler
-                       self.eventmap[ev]()
+                       if self.with_event:
+                               self.eventmap[ev](ev)
+                       else:
+                               self.eventmap[ev]()
        
        def enablePolling(self, interval=60000):
                if interval:
@@ -35,21 +41,20 @@ class PerServiceBase(GUIComponent):
        def poll(self):
                pass
 
-class PerServiceDisplay(PerServiceBase, VariableText):
+class PerServiceDisplay(PerServiceBase, VariableText, GUIComponent):
        """Mixin for building components which display something which changes on navigation events, for example "service name" """
        def __init__(self, navcore, eventmap):
+               GUIComponent.__init__(self)
                VariableText.__init__(self)
                PerServiceBase.__init__(self, navcore, eventmap)
 
-       def createWidget(self, parent):
-               # by default, we use a label to display our data.
-               g = eLabel(parent)
-               return g
+       GUI_WIDGET = eLabel
 
-class PerServiceDisplayProgress(GUIComponent, VariableValue, PerServiceBase):
+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)
@@ -57,7 +62,4 @@ class PerServiceDisplayProgress(GUIComponent, VariableValue, PerServiceBase):
                # start with stopped state, so simulate that
                self.event(iPlayableService.evEnd)
 
-       def createWidget(self, parent):
-               # by default, we use a label to display our data.
-               self.g = eSlider(parent)
-               return self.g
+       GUI_WIDGET = eSlider