X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9d3112aad388b4369a339b851aa2507a02bb2d4f..3e3832c8784e966dca29354c158ffb636f33c8cb:/lib/python/Components/Converter/FrontendInfo.py

diff --git a/lib/python/Components/Converter/FrontendInfo.py b/lib/python/Components/Converter/FrontendInfo.py
index e2923a95..160214a7 100644
--- a/lib/python/Components/Converter/FrontendInfo.py
+++ b/lib/python/Components/Converter/FrontendInfo.py
@@ -6,6 +6,9 @@ class FrontendInfo(Converter, object):
 	SNR = 1
 	AGC = 2
 	LOCK = 3
+	SNRdB = 4
+	SLOT_NUMBER = 5
+	TUNER_TYPE = 6
 
 	def __init__(self, type):
 		Converter.__init__(self, type)
@@ -13,14 +16,21 @@ class FrontendInfo(Converter, object):
 			self.type = self.BER
 		elif type == "SNR":
 			self.type = self.SNR
+		elif type == "SNRdB":
+			self.type = self.SNRdB
 		elif type == "AGC":
 			self.type = self.AGC
+		elif type == "NUMBER":
+			self.type = self.SLOT_NUMBER
+		elif type == "TYPE":
+			self.type = self.TUNER_TYPE
 		else:
 			self.type = self.LOCK
 
 	@cached
 	def getText(self):
-		assert self.type != self.LOCK, "the text output of FrontendInfo cannot be used for lock info"
+		assert self.type not in [self.LOCK, self.SLOT_NUMBER], "the text output of FrontendInfo cannot be used for lock info"
+		percent = None
 		if self.type == self.BER: # as count
 			count = self.source.ber
 			if count is not None:
@@ -31,10 +41,15 @@ class FrontendInfo(Converter, object):
 			percent = self.source.agc
 		elif self.type == self.SNR:
 			percent = self.source.snr
-		
+		elif self.type == self.SNRdB:
+			if self.source.snr_db is not None:
+				return "%3.02f dB" % (self.source.snr_db / 100.0)
+			elif self.source.snr is not None: #fallback to normal SNR...
+				percent = self.source.snr
+		elif self.type == self.TUNER_TYPE:
+			return self.source.frontend_type and self.frontend_type or "Unknown"
 		if percent is None:
 			return "N/A"
-
 		return "%d %%" % (percent * 100 / 65536)
 
 	@cached
@@ -61,6 +76,17 @@ class FrontendInfo(Converter, object):
 				return self.BER or 0
 			else:
 				return self.range
+		elif self.type == self.TUNER_TYPE:
+			type = self.source.frontend_type
+			if type == 'DVB-S':
+				return 0
+			elif type == 'DVB-C':
+				return 1
+			elif type == 'DVB-T':
+				return 2
+			return -1
+		elif self.type == self.SLOT_NUMBER:
+			return self.source.slot_number or -1
 
 	range = 65536
 	value = property(getValue)