X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f2d8c971838696ff5f4f24717a24be4477b65373..534b74c472193e55d2eb84099f8f810abe62ecf0:/lib/python/Screens/ServiceInfo.py

diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py
index e4735f41..83cdcd5f 100644
--- a/lib/python/Screens/ServiceInfo.py
+++ b/lib/python/Screens/ServiceInfo.py
@@ -43,12 +43,12 @@ class ServiceInfoList(HTMLComponent, GUIComponent):
 		self.list = source
 		self.l.setList(self.list)
 		self.l.setFont(0, gFont("Regular", 23))
+		self.l.setItemHeight(25)
 
 	GUI_WIDGET = eListbox
-	
+
 	def postWidgetCreate(self, instance):
 		self.instance.setContent(self.l)
-		self.instance.setItemHeight(25)
 
 TYPE_SERVICE_INFO = 1
 TYPE_TRANSPONDER_INFO = 2
@@ -100,7 +100,7 @@ class ServiceInfo(Screen):
 
 	def information(self):
 		if self.type == TYPE_SERVICE_INFO:
-			if self.session.nav.getCurrentlyPlayingServiceReference() is not None:
+			if self.session.nav.getCurrentlyPlayingServiceReference():
 				name = ServiceReference(self.session.nav.getCurrentlyPlayingServiceReference()).getServiceName()
 			else:
 				name = "N/A"
@@ -161,7 +161,7 @@ class ServiceInfo(Screen):
 	
 	def showFrontendData(self, real):
 		if self.type == TYPE_SERVICE_INFO:
-			frontendData = self.feinfo and self.feinfo.getFrontendData(real)
+			frontendData = self.feinfo and self.feinfo.getAll(real)
 			Labels = self.getFEData(frontendData)
 			self.fillList(Labels)
 	
@@ -174,42 +174,39 @@ class ServiceInfo(Screen):
 			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["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),
-					   ("Polarization", frontendData["polarization"], TYPE_TEXT),
-					   ("Inversion", frontendData["inversion"], TYPE_TEXT),
-					   ("FEC inner", frontendData["fec_inner"], TYPE_TEXT),
-				   		)
-		elif frontendData["tuner_type"] == "DVB-C":
-			return ( ("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], TYPE_TEXT),
-					   ("Type", frontendData["tuner_type"], TYPE_TEXT),
-					   ("Frequency", frontendData["frequency"], TYPE_VALUE_DEC),
-					   ("Symbolrate", frontendData["symbol_rate"], TYPE_VALUE_DEC),
-					   ("Modulation", frontendData["modulation"], TYPE_TEXT),
-					   ("Inversion", frontendData["inversion"], TYPE_TEXT),
-					   ("FEC inner", frontendData["fec_inner"], TYPE_TEXT),
-				   		)
-		elif frontendData["tuner_type"] == "DVB-T":
-			return ( ("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], TYPE_TEXT),
-					   ("Type", frontendData["tuner_type"], TYPE_TEXT),
-					   ("Frequency", frontendData["frequency"], TYPE_VALUE_DEC),
-					   ("Inversion", frontendData["inversion"], TYPE_TEXT),
-					   ("Bandwidth", frontendData["bandwidth"], TYPE_VALUE_DEC),
-					   ("CodeRateLP", frontendData["code_rate_lp"], TYPE_TEXT),
-					   ("CodeRateHP", frontendData["code_rate_hp"], TYPE_TEXT),
-					   ("Constellation", frontendData["constellation"], TYPE_TEXT),
-					   ("Transmission Mode", frontendData["transmission_mode"], TYPE_TEXT),
-					   ("Guard Interval", frontendData["guard_interval"], TYPE_TEXT),
-					   ("Hierarchy Inform.", frontendData["hierarchy_information"], TYPE_TEXT),
-						)
-		
+		if frontendData and len(frontendData):
+			if frontendData["tuner_type"] == "DVB-S":
+				return (("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], 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),
+							("Polarization", frontendData["polarization"], TYPE_TEXT),
+							("Inversion", frontendData["inversion"], TYPE_TEXT),
+							("FEC inner", frontendData["fec_inner"], TYPE_TEXT))
+			elif frontendData["tuner_type"] == "DVB-C":
+				return (("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], TYPE_TEXT),
+						("Type", frontendData["tuner_type"], TYPE_TEXT),
+						("Frequency", frontendData["frequency"], TYPE_VALUE_DEC),
+						("Symbolrate", frontendData["symbol_rate"], TYPE_VALUE_DEC),
+						("Modulation", frontendData["modulation"], TYPE_TEXT),
+						("Inversion", frontendData["inversion"], TYPE_TEXT),
+						("FEC inner", frontendData["fec_inner"], TYPE_TEXT))
+			elif frontendData["tuner_type"] == "DVB-T":
+				return (("NIM", ['A', 'B', 'C', 'D'][frontendData["tuner_number"]], TYPE_TEXT),
+						("Type", frontendData["tuner_type"], TYPE_TEXT),
+						("Frequency", frontendData["frequency"], TYPE_VALUE_DEC),
+						("Inversion", frontendData["inversion"], TYPE_TEXT),
+						("Bandwidth", frontendData["bandwidth"], TYPE_VALUE_DEC),
+						("CodeRateLP", frontendData["code_rate_lp"], TYPE_TEXT),
+						("CodeRateHP", frontendData["code_rate_hp"], TYPE_TEXT),
+						("Constellation", frontendData["constellation"], TYPE_TEXT),
+						("Transmission Mode", frontendData["transmission_mode"], TYPE_TEXT),
+						("Guard Interval", frontendData["guard_interval"], TYPE_TEXT),
+						("Hierarchy Inform.", frontendData["hierarchy_information"], TYPE_TEXT))
+		return [ ]
+
 	def fillList(self, Labels):
 		tlist = [ ]