use session.CurrentService in PVRState

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 06aa859f6f5e2a705fcfc87a07d0b7cc854f5af4..18db44ddcc120323fc5c508c442f3f682298917d 100644 (file)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -787,7 +787,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
        <!-- Timeshift state -->
        <screen name="TimeshiftState" flags="wfNoBorder" position="70,70" size="150,60" backgroundColor="transpBlack" zPosition="2">
                <widget name="state" position="0,0" size="150,30" font="Regular;25" halign="center" backgroundColor="transpBlack" />
        <!-- Timeshift state -->
        <screen name="TimeshiftState" flags="wfNoBorder" position="70,70" size="150,60" backgroundColor="transpBlack" zPosition="2">
                <widget name="state" position="0,0" size="150,30" font="Regular;25" halign="center" backgroundColor="transpBlack" />

-               <widget source="CurrentService" render="Label" position="0,30" size="150,30" font="Regular;25" halign="center" backgroundColor="transpBlack" foregroundColor="white" >
+               <widget source="session.CurrentService" render="Label" position="0,30" size="150,30" font="Regular;25" halign="center" backgroundColor="transpBlack" foregroundColor="white" >

                        <convert type="ServicePosition">Remaining</convert>
                </widget>
        </screen>
                        <convert type="ServicePosition">Remaining</convert>
                </widget>
        </screen>

diff --git a/lib/python/Screens/PVRState.py b/lib/python/Screens/PVRState.py
index f7b2abf700b6ff0252a6ecce73d2ab0b455c9a8a..8b90c420217321e9dfff63b87029e18497de0410 100644 (file)
--- a/lib/python/Screens/PVRState.py
+++ b/lib/python/Screens/PVRState.py
@@ -1,16 +1,12 @@
 from Screen import Screen
 
 from Components.Label import Label
 from Screen import Screen
 
 from Components.Label import Label

-from Components.Sources.CurrentService import CurrentService

 
 class PVRState(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)
 
 class PVRState(Screen):
        def __init__(self, session):
                Screen.__init__(self, session)

-               

                self["state"] = Label(text="")
 
 class TimeshiftState(PVRState):
        def __init__(self, session):
                PVRState.__init__(self, session)
                self["state"] = Label(text="")
 
 class TimeshiftState(PVRState):
        def __init__(self, session):
                PVRState.__init__(self, session)

-               
-               self["CurrentService"] = CurrentService(self.session.nav)