From: Felix Domke <tmbinc@elitedvb.net>
Date: Thu, 15 Jun 2006 17:39:02 +0000 (+0000)
Subject: remove GUIComponent from PerServiceDisplay
X-Git-Tag: 2.6.0~3316
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/1889fbce45ea5471d15f95c04594d9aa2a429120?hp=36dc37e5d0c9ef8fc5f923ad38ee6cc98f316556

remove GUIComponent from PerServiceDisplay
---

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,