some cleanups,

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

diff --git a/lib/python/Components/PerServiceDisplay.py b/lib/python/Components/PerServiceDisplay.py
index 23f6ecce6828e18191687262f506e2aae29b8555..cb86bd84a35603c0f0e50e54d3fe6cfa87f1d6f4 100644 (file)
--- a/lib/python/Components/PerServiceDisplay.py
+++ b/lib/python/Components/PerServiceDisplay.py
@@ -1,36 +1,35 @@
-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 PerServiceDisplay(GUIComponent, VariableText):
-       """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)
+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.poll_timer.callback.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_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):
+               func = self.eventmap.get(ev)
+               if func:
                        # call handler
-                       self.eventmap[ev]()
+                       if self.with_event:
+                               func(ev)
+                       else:
+                               func()
        
-       def createWidget(self, parent):
-               # by default, we use a label to display our data.
-               g = eLabel(parent)
-               return g
-
        def enablePolling(self, interval=60000):
                if interval:
                        self.poll_timer.start(interval)
@@ -43,10 +42,24 @@ class PerServiceDisplay(GUIComponent, VariableText):
        def poll(self):
                pass
 
-class PerServiceDisplayProgress(GUIComponent, VariableValue, PerServiceDisplay):
+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 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)
@@ -54,8 +67,8 @@ class PerServiceDisplayProgress(GUIComponent, VariableValue, PerServiceDisplay):
                # start with stopped state, so simulate that
                self.event(iPlayableService.evEnd)
 
+       GUI_WIDGET = eSlider
 
-       def createWidget(self, parent):
-               # by default, we use a label to display our data.
-               self.g = eSlider(parent)
-               return self.g
+       def destroy(self):
+               PerServiceBase.destroy(self)
+               GUIComponent.destroy(self)