X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FServiceInfo.py;h=639b970a41fd32493b71110c90cfe5711369e1ae;hp=a4bb4e02a4d5f0f75cad3cbff145efbef9468ba0;hb=e03c732afb410b4d6b9f9540c36c33c941ee38f1;hpb=185319be599e9f42cd695da14c01499fc79f68d5;ds=sidebyside

diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py
index a4bb4e0..639b970 100644
--- a/lib/python/Screens/ServiceInfo.py
+++ b/lib/python/Screens/ServiceInfo.py
@@ -68,16 +68,17 @@ class ServiceInfo(Screen):
 		service = session.nav.getCurrentService()
 		if service is not None:
 			self.info = service.info()
-			self.feinfo = service.frontendStatusInfo()
+			self.feinfo = service.frontendInfo()
 			print self.info.getInfoObject(iServiceInformation.sCAIDs);
 		else:
 			self.info = None
+			self.feinfo = None
 
 
-		self["red"] = Label("Serviceinfo")
-		self["green"] = Label("PIDs")
-		self["yellow"] = Label("Transponder")
-		self["blue"] = Label("Tuner status")
+		self["red"] = Label(_("Serviceinfo"))
+		self["green"] = Label(_("PIDs"))
+		self["yellow"] = Label(_("Transponder"))
+		self["blue"] = Label(_("Tuner status"))
 	
 		tlist = [ ]
 
@@ -106,22 +107,24 @@ class ServiceInfo(Screen):
 				   ("SID", self.getServiceInfoValue(iServiceInformation.sSID), TYPE_VALUE_HEX_DEC, 4))
 		self.fillList(Labels)
 	
-	def transponder(self):
-		frontendData = self.feinfo.getFrontendData(True)
+	def showFrontendData(self, real):
+		frontendData = self.feinfo and self.feinfo.getFrontendData(real)
 		Labels = self.getFEData(frontendData)
 		self.fillList(Labels)
+	
+	def transponder(self):
+		self.showFrontendData(True)
 		
 	def tuner(self):
-		frontendData = self.feinfo.getFrontendData(False)
-		Labels = self.getFEData(frontendData)
-		self.fillList(Labels)
+		self.showFrontendData(False)
 		
 	def getFEData(self, frontendData):
 		if frontendData is None:
 			return []
 		if frontendData["tuner_type"] == "DVB-S":
 			return ( ("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], TYPE_TEXT),
-					   ("Type", frontendData["tuner_type"], TYPE_TEXT),
+					   ("Type", frontendData["system"], TYPE_TEXT),
+					   ("Modulation", frontendData["modulation"], TYPE_TEXT),
 					   ("Orbital position", frontendData["orbital_position"], TYPE_VALUE_DEC),
 					   ("Frequency", frontendData["frequency"], TYPE_VALUE_DEC),
 					   ("Symbolrate", frontendData["symbol_rate"], TYPE_VALUE_DEC),
@@ -156,7 +159,6 @@ class ServiceInfo(Screen):
 		tlist = [ ]
 
 		for item in Labels:
-			print item
 			value = item[1]
 			if len(item) < 4:
 				tlist.append(ServiceInfoListEntry(item[0]+":", value, item[2]))