aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2006-06-15 17:39:02 +0000
committerFelix Domke <tmbinc@elitedvb.net>2006-06-15 17:39:02 +0000
commit1889fbce45ea5471d15f95c04594d9aa2a429120 (patch)
tree7ef8a835feced2dfa9b439c08217877f7c34f7b3 /lib/python
parent36dc37e5d0c9ef8fc5f923ad38ee6cc98f316556 (diff)
downloadenigma2-1889fbce45ea5471d15f95c04594d9aa2a429120.tar.gz
enigma2-1889fbce45ea5471d15f95c04594d9aa2a429120.zip
remove GUIComponent from PerServiceDisplay
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Components/PerServiceDisplay.py6
-rw-r--r--lib/python/Components/ServicePosition.py4
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/python/Components/PerServiceDisplay.py b/lib/python/Components/PerServiceDisplay.py
index 22305ca9..500538c3 100644
--- 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
-class PerServiceBase(GUIComponent):
+class PerServiceBase(object):
def __init__(self, navcore, eventmap):
- GUIComponent.__init__(self)
self.eventmap = eventmap
self.navcore = navcore
self.navcore.event.append(self.event)
@@ -38,9 +37,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)
diff --git a/lib/python/Components/ServicePosition.py b/lib/python/Components/ServicePosition.py
index ba87e3ef..f5771e3a 100644
--- a/lib/python/Components/ServicePosition.py
+++ b/lib/python/Components/ServicePosition.py
@@ -1,4 +1,5 @@
from PerServiceDisplay import PerServiceDisplay, PerServiceBase
+from Components.GUIComponent import GUIComponent
from enigma import eTimer, iPlayableService, iSeekableServicePtr, ePositionGauge
import time
@@ -84,8 +85,9 @@ class ServicePosition(PerServiceDisplay):
self.updateTimer.stop()
self.setText("");
-class ServicePositionGauge(PerServiceBase):
+class ServicePositionGauge(PerServiceBase, GUIComponent):
def __init__(self, navcore):
+ GUIComponent.__init__(self)
PerServiceBase.__init__(self, navcore,
{
iPlayableService.evStart: self.newService,