optionally call callback with event argument

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

diff --git a/lib/python/Components/PerServiceDisplay.py b/lib/python/Components/PerServiceDisplay.py
index 22305ca94ab8c94fd8dcff70254b458e85000e91..a36d4a6045131142f65ec7fd972f34e0d8213992 100644 (file)
--- a/lib/python/Components/PerServiceDisplay.py
+++ b/lib/python/Components/PerServiceDisplay.py
@@ -5,14 +5,14 @@ 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)
@@ -24,7 +24,10 @@ class PerServiceBase(GUIComponent):
                # 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:
@@ -38,9 +41,10 @@ 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)