From: Felix Domke <tmbinc@elitedvb.net>
Date: Sun, 7 Oct 2007 09:10:23 +0000 (+0000)
Subject: use session.CurrentService in PVRState
X-Git-Tag: 2.6.0~1835
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/af399f0121b6b53944f9a09a83e6ced078dc0ef3?hp=3a32ec6cc71286248042152aa3aed2ed2c75d55e

use session.CurrentService in PVRState
---

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 06aa859f..18db44dd 100644
--- 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" />
-		<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>
diff --git a/lib/python/Screens/PVRState.py b/lib/python/Screens/PVRState.py
index f7b2abf7..8b90c420 100644
--- 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 Components.Sources.CurrentService import CurrentService
 
 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["CurrentService"] = CurrentService(self.session.nav)