some cleanups,

[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 e1623ae1479d9609f276f5cf29c318a0ded2ea74..821c9f12077f223fca9de258b3202cd907064871 100644 (file)
--- a/lib/python/Components/Sources/FrontendStatus.py
+++ b/lib/python/Components/Sources/FrontendStatus.py
@@ -9,7 +9,7 @@ class FrontendStatus(Source):
                self.frontend_source = frontend_source
                self.invalidate()
                self.poll_timer = eTimer()
-               self.poll_timer.timeout.get().append(self.updateFrontendStatus)
+               self.poll_timer.callback.append(self.updateFrontendStatus)
                self.poll_timer.start(update_interval)
 
        def invalidate(self):
@@ -20,20 +20,20 @@ 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, ))
 
        def getFrontendStatus(self):
                if self.frontend_source:
-                       frontend = self.frontend_source
+                       frontend = self.frontend_source()
+                       dict = { }
                        if frontend:
-                               dict = { }
                                frontend.getFrontendStatus(dict)
-                               return dict
+                       return dict
                elif self.service_source:
                        service = self.service_source()
                        feinfo = service and service.frontendInfo()
@@ -47,3 +47,7 @@ class FrontendStatus(Source):
                else:
                        self.poll_timer.start(self.update_interval)
 
+       def destroy(self):
+               self.poll_timer.callback.remove(self.updateFrontendStatus)
+               Source.destroy(self)
+