add SNRdB, but requires proper frontend support

[enigma2.git] / lib / python / Components / Converter / FrontendInfo.py

diff --git a/lib/python/Components/Converter/FrontendInfo.py b/lib/python/Components/Converter/FrontendInfo.py
index afff2a7a90e33310652f5589a4a583b8d015963d..bcef9311fc7a750dca5a201efe1f29136777d7f4 100644 (file)
--- a/lib/python/Components/Converter/FrontendInfo.py
+++ b/lib/python/Components/Converter/FrontendInfo.py
@@ -1,22 +1,27 @@
 from Components.Converter.Converter import Converter
+from Components.Element import cached
 
 class FrontendInfo(Converter, object):
        BER = 0
        SNR = 1
        AGC = 2
        LOCK = 3
+       SNRdB = 4
 
-       def __init__(self, type, *args, **kwargs):
-               Converter.__init__(self)
+       def __init__(self, type):
+               Converter.__init__(self, type)
                if type == "BER":
                        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
                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"
                if self.type == self.BER: # as count
@@ -29,20 +34,28 @@ 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 is None:
+                               return "N/A"
+                       return "%3.02f dB" % (self.source.snr / 100.0)
                if percent is None:
                        return "N/A"
 
                return "%d %%" % (percent * 100 / 65536)
 
+       @cached
        def getBool(self):
-               assert self.type == LOCK, "the boolean output of FrontendInfo can only be used for lock info"
-               return self.source.lock
+               assert self.type in [self.LOCK, self.BER], "the boolean output of FrontendInfo can only be used for lock or BER info"
+               if self.type == self.LOCK:
+                       return self.source.lock
+               else:
+                       return self.source.ber > 0
 
        text = property(getText)
 
        boolean = property(getBool)
 
+       @cached
        def getValue(self):
                assert self.type != self.LOCK, "the value/range output of FrontendInfo can not be used for lock info"
                if self.type == self.AGC: