add support for opening m3u, pls, extended m3u and extended pls playlists

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

diff --git a/lib/python/Components/PerServiceDisplay.py b/lib/python/Components/PerServiceDisplay.py
index 821f6d165bc2a070a271761e59de42dd0948b5a2..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
 
-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,18 +37,16 @@ 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)
 
-       def createWidget(self, parent):
-               # by default, we use a label to display our data.
-               g = eLabel(parent)
-               return g
+       GUI_WIDGET = eLabel
 
-class PerServiceDisplayProgress(GUIComponent, VariableValue, PerServiceBase):
+class PerServiceDisplayProgress(PerServiceBase, VariableValue, GUIComponent):
        def __init__(self, navcore, eventmap):
                GUIComponent.__init__(self)
                VariableValue.__init__(self)
@@ -60,7 +57,4 @@ class PerServiceDisplayProgress(GUIComponent, VariableValue, PerServiceBase):
                # start with stopped state, so simulate that
                self.event(iPlayableService.evEnd)
 
-       def createWidget(self, parent):
-               # by default, we use a label to display our data.
-               self.g = eSlider(parent)
-               return self.g
+       GUI_WIDGET = eSlider