remove GUIComponent from PerServiceDisplay
authorFelix Domke <tmbinc@elitedvb.net>
Thu, 15 Jun 2006 17:39:02 +0000 (17:39 +0000)
committerFelix Domke <tmbinc@elitedvb.net>
Thu, 15 Jun 2006 17:39:02 +0000 (17:39 +0000)
lib/python/Components/PerServiceDisplay.py
lib/python/Components/ServicePosition.py

index 22305ca..500538c 100644 (file)
@@ -5,9 +5,8 @@ from VariableValue import *
 from enigma import iPlayableService
 from enigma import eLabel, eSlider, eTimer
 
 from enigma import iPlayableService
 from enigma import eLabel, eSlider, eTimer
 
-class PerServiceBase(GUIComponent):
+class PerServiceBase(object):
        def __init__(self, navcore, eventmap):
        def __init__(self, navcore, eventmap):
-               GUIComponent.__init__(self)
                self.eventmap = eventmap
                self.navcore = navcore
                self.navcore.event.append(self.event)
                self.eventmap = eventmap
                self.navcore = navcore
                self.navcore.event.append(self.event)
@@ -38,9 +37,10 @@ class PerServiceBase(GUIComponent):
        def poll(self):
                pass
 
        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):
        """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)
 
                VariableText.__init__(self)
                PerServiceBase.__init__(self, navcore, eventmap)
 
index ba87e3e..f5771e3 100644 (file)
@@ -1,4 +1,5 @@
 from PerServiceDisplay import PerServiceDisplay, PerServiceBase
 from PerServiceDisplay import PerServiceDisplay, PerServiceBase
+from Components.GUIComponent import GUIComponent
 from enigma import eTimer, iPlayableService, iSeekableServicePtr, ePositionGauge
 import time
 
 from enigma import eTimer, iPlayableService, iSeekableServicePtr, ePositionGauge
 import time
 
@@ -84,8 +85,9 @@ class ServicePosition(PerServiceDisplay):
                self.updateTimer.stop()
                self.setText("");
 
                self.updateTimer.stop()
                self.setText("");
 
-class ServicePositionGauge(PerServiceBase):
+class ServicePositionGauge(PerServiceBase, GUIComponent):
        def __init__(self, navcore):
        def __init__(self, navcore):
+               GUIComponent.__init__(self)
                PerServiceBase.__init__(self, navcore,
                        {
                                iPlayableService.evStart: self.newService,
                PerServiceBase.__init__(self, navcore,
                        {
                                iPlayableService.evStart: self.newService,