simplify, cleanup and fix ParentalControlList

[enigma2.git] / lib / python / Components / TunerInfo.py

diff --git a/lib/python/Components/TunerInfo.py b/lib/python/Components/TunerInfo.py
index 53cb3d90b8f94e30f594c4e9c5bb3d66fa0d40af..24950221ef217cbe19e31fdb341840ed1d78de81 100644 (file)
--- a/lib/python/Components/TunerInfo.py
+++ b/lib/python/Components/TunerInfo.py
@@ -1,6 +1,6 @@
 from GUIComponent import GUIComponent
 
-from enigma import eLabel, eSlider, iFrontendStatusInformation
+from enigma import eLabel, eSlider, iFrontendInformation
 
 from math import log
 
@@ -9,7 +9,6 @@ class TunerInfo(GUIComponent):
        AGC = 1
        BER = 2
        LOCK = 3
-       
        SNR_PERCENTAGE = 0
        AGC_PERCENTAGE = 1
        BER_VALUE = 2
@@ -18,34 +17,35 @@ class TunerInfo(GUIComponent):
        BER_BAR = 5
        LOCK_STATE = 6
        SYNC_STATE = 7
-       def __init__(self, type, servicefkt = None, frontendfkt = None):
+
+       def __init__(self, type, servicefkt = None, frontendfkt = None, statusDict = None):
                GUIComponent.__init__(self)
                self.instance = None
                self.message = None
                self.value = None
-               
                self.servicefkt = servicefkt
                self.frontendfkt = frontendfkt
+               self.statusDict = statusDict
                self.type = type
                self.update()
-       
+
        def setText(self, text):
                self.message = text
                if self.instance:
                        self.instance.setText(self.message)
-       
+
        def setValue(self, value):
                self.value = value
                if self.instance:
                        self.instance.setValue(self.value)              
-                       
+
        def calc(self,val):
                if not val:
                        return 0
                if val < 2500:
                        return (long)(log(val)/log(2))
                return val*100/65535
-       
+
        def update(self):
                if self.type == self.SNR_PERCENTAGE or self.type == self.SNR_BAR:
                        value = self.getValue(self.SNR) * 100 / 65536
@@ -69,34 +69,43 @@ class TunerInfo(GUIComponent):
                                self.setText(_("locked"))
                        else:
                                self.setText(_("not locked"))
-                               
+
        def getValue(self, what):
-               if self.servicefkt is not None:
+               if self.statusDict:
+                       if what == self.SNR:
+                               return self.statusDict.get("tuner_signal_power", 0)
+                       elif what == self.AGC:
+                               return self.statusDict.get("tuner_signal_quality", 0)
+                       elif what == self.BER:
+                               return self.statusDict.get("tuner_bit_error_rate", 0)
+                       elif what == self.LOCK:
+                               return self.statusDict.get("tuner_locked", 0)
+               elif self.servicefkt:
                        service = self.servicefkt()
                        if service is not None:
-                               feinfo = service.frontendStatusInfo()
+                               feinfo = service.frontendInfo()
                                if feinfo is not None:
                                        if what == self.SNR:
-                                               return feinfo.getFrontendInfo(iFrontendStatusInformation.signalPower)
+                                               return feinfo.getFrontendInfo(iFrontendInformation.signalPower)
                                        elif what == self.AGC:
-                                               return feinfo.getFrontendInfo(iFrontendStatusInformation.signalQuality)
+                                               return feinfo.getFrontendInfo(iFrontendInformation.signalQuality)
                                        elif what == self.BER:
-                                               return feinfo.getFrontendInfo(iFrontendStatusInformation.bitErrorRate)
+                                               return feinfo.getFrontendInfo(iFrontendInformation.bitErrorRate)
                                        elif what == self.LOCK:
-                                               return feinfo.getFrontendInfo(iFrontendStatusInformation.LockState)
-               elif self.frontendfkt is not None:
+                                               return feinfo.getFrontendInfo(iFrontendInformation.lockState)
+               elif self.frontendfkt:
                        frontend = self.frontendfkt()
-                       if what == self.SNR:
-                               return frontend.readFrontendData(iFrontendStatusInformation.signalPower)
-                       elif what == self.AGC:
-                               return frontend.readFrontendData(iFrontendStatusInformation.signalQuality)
-                       elif what == self.BER:
-                               return frontend.readFrontendData(iFrontendStatusInformation.bitErrorRate)
-                       elif what == self.LOCK:
-                               return frontend.readFrontendData(iFrontendStatusInformation.LockState)
-               
+                       if frontend:
+                               if what == self.SNR:
+                                       return frontend.readFrontendData(iFrontendInformation.signalPower)
+                               elif what == self.AGC:
+                                       return frontend.readFrontendData(iFrontendInformation.signalQuality)
+                               elif what == self.BER:
+                                       return frontend.readFrontendData(iFrontendInformation.bitErrorRate)
+                               elif what == self.LOCK:
+                                       return frontend.readFrontendData(iFrontendInformation.lockState)
                return 0
-                               
+
        def createWidget(self, parent):
                if self.SNR_PERCENTAGE <= self.type <= self.BER_VALUE or self.type == self.LOCK_STATE:
                        return eLabel(parent)
@@ -104,7 +113,7 @@ class TunerInfo(GUIComponent):
                        self.g = eSlider(parent)
                        self.g.setRange(0, 100)
                        return self.g
-               
+
        def postWidgetCreate(self, instance):
                if self.message is not None:
                        instance.setText(self.message)