signal quality is SNR, signal power is AGC

[enigma2.git] / lib / python / Components / Sources / FrontendStatus.py

diff --git a/lib/python/Components/Sources/FrontendStatus.py b/lib/python/Components/Sources/FrontendStatus.py
index 5b7e5b0c3a33da9d5ecb4eccb9f069d998b16a28..3e469e0da9b4fc5142bd1c2ca6ca7c340bd58a59 100644 (file)
--- a/lib/python/Components/Sources/FrontendStatus.py
+++ b/lib/python/Components/Sources/FrontendStatus.py
@@ -2,15 +2,15 @@ from Source import Source
 from enigma import eTimer
 
 class FrontendStatus(Source):
-       def __init__(self, service_source = None, frontend_source = None):
+       def __init__(self, service_source = None, frontend_source = None, update_interval = 1000):
                Source.__init__(self)
+               self.update_interval = update_interval
                self.service_source = service_source
                self.frontend_source = frontend_source
                self.invalidate()
-               
                self.poll_timer = eTimer()
-               self.poll_timer.timeout.get().append(self.updateFrontendStatus)
-               self.poll_timer.start(1000)
+               self.poll_timer.callback.append(self.updateFrontendStatus)
+               self.poll_timer.start(update_interval)
 
        def invalidate(self):
                self.snr = self.agc = self.ber = self.lock = self.snr_db = None
@@ -20,9 +20,9 @@ class FrontendStatus(Source):
                if not status:
                        self.invalidate()
                else:
-                       self.snr = status.get("tuner_signal_power")
-                       self.snr_db = status.get("tuner_signal_power_db")
-                       self.agc = status.get("tuner_signal_quality")
+                       self.snr = status.get("tuner_signal_quality")
+                       self.snr_db = status.get("tuner_signal_quality_db")
+                       self.agc = status.get("tuner_signal_power")
                        self.ber = status.get("tuner_bit_error_rate")
                        self.lock = status.get("tuner_locked")
                self.changed((self.CHANGED_ALL, ))
@@ -30,9 +30,10 @@ class FrontendStatus(Source):
        def getFrontendStatus(self):
                if self.frontend_source:
                        frontend = self.frontend_source()
+                       dict = { }
                        if frontend:
-                               dict = { }
                                frontend.getFrontendStatus(dict)
+                       return dict
                elif self.service_source:
                        service = self.service_source()
                        feinfo = service and service.frontendInfo()
@@ -44,5 +45,8 @@ class FrontendStatus(Source):
                if suspended:
                        self.poll_timer.stop()
                else:
-                       self.poll_timer.start(1000)
+                       self.poll_timer.start(self.update_interval)
+
+       def destroy(self):
+               self.poll_timer.callback.remove(self.updateFrontendStatus)