remove GUIComponent from PerServiceDisplay

diff --git a/lib/python/Components/PerServiceDisplay.py b/lib/python/Components/PerServiceDisplay.py
index 22305ca94ab8c94fd8dcff70254b458e85000e91..500538c3d56708dd5cc97a512f61b57703779ace 100644 (file)
--- a/lib/python/Components/PerServiceDisplay.py
+++ b/lib/python/Components/PerServiceDisplay.py
@@ -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)
 

diff --git a/lib/python/Components/ServicePosition.py b/lib/python/Components/ServicePosition.py
index ba87e3ef680df8438255f6a9a38352115d41a18b..f5771e3a0d9f8e9be032f9c5bde480429eec690d 100644 (file)
--- a/lib/python/Components/ServicePosition.py
+++ b/lib/python/Components/ServicePosition.py
@@ -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,