X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/67b53c1cb06988394c35a6e965c99b72b67fe1be..4f4a0a7483b746cc148fa94665eb2975e6c8df90:/lib/python/Screens/ServiceInfo.py

diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py
index 01cfc61a..e07b3208 100644
--- a/lib/python/Screens/ServiceInfo.py
+++ b/lib/python/Screens/ServiceInfo.py
@@ -5,6 +5,7 @@ from Components.ActionMap import ActionMap
 from Components.Label import Label
 from ServiceReference import ServiceReference
 from enigma import eListboxPythonMultiContent, eListbox, gFont, iServiceInformation, eServiceCenter
+from Tools.Transponder import ConvertToHumanReadable
 
 RT_HALIGN_LEFT = 0
 
@@ -14,6 +15,9 @@ TYPE_VALUE_DEC = 2
 TYPE_VALUE_HEX_DEC = 3
 TYPE_SLIDER = 4
 
+def to_unsigned(x):
+	return x & 0xFFFFFFFF
+
 def ServiceInfoListEntry(a, b, valueType=TYPE_TEXT, param=4):
 	res = [ ]
 
@@ -23,11 +27,11 @@ def ServiceInfoListEntry(a, b, valueType=TYPE_TEXT, param=4):
 	print "b:", b
 	if type(b) is not str:
 		if valueType == TYPE_VALUE_HEX:
-			b = ("0x%0" + str(param) + "x") % b
+			b = ("0x%0" + str(param) + "x") % to_unsigned(b)
 		elif valueType == TYPE_VALUE_DEC:
 			b = str(b)
 		elif valueType == TYPE_VALUE_HEX_DEC:
-			b = ("0x%0" + str(param) + "x (%dd)") % (b, b)
+			b = ("0x%0" + str(param) + "x (%dd)") % (to_unsigned(b), b)
 		else:
 			b = str(b)
 	
@@ -101,8 +105,10 @@ class ServiceInfo(Screen):
 		if self.type == TYPE_SERVICE_INFO:
 			if self.session.nav.getCurrentlyPlayingServiceReference():
 				name = ServiceReference(self.session.nav.getCurrentlyPlayingServiceReference()).getServiceName()
+				refstr = self.session.nav.getCurrentlyPlayingServiceReference().toString()
 			else:
 				name = "N/A"
+				refstr = "N/A"
 			aspect = self.getServiceInfoValue(iServiceInformation.sAspect)
 			if aspect in ( 1, 2, 5, 6, 9, 0xA, 0xD, 0xE ):
 				aspect = "4:3"
@@ -115,35 +121,39 @@ class ServiceInfo(Screen):
 						   ("Provider", self.getServiceInfoValue(iServiceInformation.sProvider), TYPE_TEXT),
 						   ("Videoformat", aspect, TYPE_TEXT),
 						   ("Videosize", "%dx%d" %(width, height), TYPE_TEXT),
-						   ("Namespace", self.getServiceInfoValue(iServiceInformation.sNamespace), TYPE_VALUE_HEX, 8))
+						   ("Namespace", self.getServiceInfoValue(iServiceInformation.sNamespace), TYPE_VALUE_HEX, 8),
+						   ("Service Reference", refstr, TYPE_TEXT))
 			else:
 				Labels = ( ("Name", name, TYPE_TEXT),
 						   ("Provider", self.getServiceInfoValue(iServiceInformation.sProvider), TYPE_TEXT),
 						   ("Videoformat", aspect, TYPE_TEXT),
-						   ("Namespace", self.getServiceInfoValue(iServiceInformation.sNamespace), TYPE_VALUE_HEX, 8))
+						   ("Namespace", self.getServiceInfoValue(iServiceInformation.sNamespace), TYPE_VALUE_HEX, 8),
+						   ("Service Reference", refstr, TYPE_TEXT))
 			self.fillList(Labels)
 		else:
 			if self.transponder_info:
-				conv = { "type" 			: _("Transponder Type"),
-						 "frequency"		: _("Frequency"),
-						 "symbolrate"		: _("Symbolrate"),
-						 "orbital position" : _("Orbital Position"),
-						 "inversion"		: _("Inversion"),
-						 "fec inner"		: _("FEC"),
-						 "modulation"		: _("Modulation"),
-						 "polarization"		: _("Polarization"),
-						 "roll off"			: _("Rolloff"),
+				tp_info = ConvertToHumanReadable(self.transponder_info)
+				conv = { "tuner_type" 		: _("Transponder Type"),
 						 "system"			: _("System"),
+						 "modulation"		: _("Modulation"),
+						 "orbital_position" : _("Orbital Position"),
+						 "frequency"		: _("Frequency"),
+						 "symbol_rate"		: _("Symbolrate"),
 						 "bandwidth"		: _("Bandwidth"),
-						 "code rate lp"		: _("Coderate LP"),
-						 "code rate hp"		: _("Coderate HP"),
+						 "polarization"		: _("Polarization"),
+						 "inversion"		: _("Inversion"),
+						 "pilot"			: _("Pilot"),
+						 "rolloff"			: _("Rolloff"),
+						 "fec_inner"		: _("FEC"),
+						 "code_rate_lp"		: _("Coderate LP"),
+						 "code_rate_hp"		: _("Coderate HP"),
 						 "constellation"	: _("Constellation"),
-						 "transmission mode": _("Transmission Mode"),
-						 "guard interval" 	: _("Guard Interval"),
-						 "hierarchy"		: _("Hierarchy Information") }
+						 "transmission_mode": _("Transmission Mode"),
+						 "guard_interval" 	: _("Guard Interval"),
+						 "hierarchy_information": _("Hierarchy Information") }
 				Labels = [ ]
-				for i in self.transponder_info.keys():
-					Labels.append( (conv[i], self.transponder_info[i], TYPE_TEXT) )
+				for i in tp_info.keys():
+					Labels.append( (conv[i], tp_info[i], TYPE_VALUE_DEC) )
 				self.fillList(Labels)
 
 	def pids(self):
@@ -172,9 +182,10 @@ class ServiceInfo(Screen):
 		if self.type == TYPE_SERVICE_INFO:
 			self.showFrontendData(False)
 
-	def getFEData(self, frontendData):
-		if frontendData and len(frontendData):
-			if frontendData["tuner_type"] == "DVB-S":
+	def getFEData(self, frontendDataOrg):
+		if frontendDataOrg and len(frontendDataOrg):
+			frontendData = ConvertToHumanReadable(frontendDataOrg)
+			if frontendDataOrg["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),
@@ -183,8 +194,10 @@ class ServiceInfo(Screen):
 							("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":
+							("FEC inner", frontendData["fec_inner"], TYPE_TEXT),
+							("Pilot", frontendData.get("pilot", None), TYPE_TEXT),
+							("Rolloff", frontendData.get("rolloff", None), TYPE_TEXT))
+			elif frontendDataOrg["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),
@@ -192,7 +205,7 @@ class ServiceInfo(Screen):
 						("Modulation", frontendData["modulation"], TYPE_TEXT),
 						("Inversion", frontendData["inversion"], TYPE_TEXT),
 						("FEC inner", frontendData["fec_inner"], TYPE_TEXT))
-			elif frontendData["tuner_type"] == "DVB-T":
+			elif frontendDataOrg["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),
@@ -210,6 +223,8 @@ class ServiceInfo(Screen):
 		tlist = [ ]
 
 		for item in Labels:
+			if item[1] is None:
+				continue;
 			value = item[1]
 			if len(item) < 4:
 				tlist.append(ServiceInfoListEntry(item[0]+":", value, item[2]))