add support for cyclic garbage collection to eTimer and eSocketNotifier

[vuplus_dvbapp] / lib / python / Components / Sources / FrontendStatus.py

diff --git a/lib/python/Components/Sources/FrontendStatus.py b/lib/python/Components/Sources/FrontendStatus.py
index f1402f1..141bd8a 100644 (file)
--- a/lib/python/Components/Sources/FrontendStatus.py
+++ b/lib/python/Components/Sources/FrontendStatus.py
@@ -1,39 +1,52 @@
 from Source import Source
-from enigma import eTimer, iFrontendInformation
+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 = None
+               self.snr = self.agc = self.ber = self.lock = self.snr_db = None
 
        def updateFrontendStatus(self):
-               feinfo = self.getFrontendInfo()
-               if feinfo is None:
+               status = self.getFrontendStatus()
+               if not status:
                        self.invalidate()
                else:
-                       (self.snr, self.agc, self.ber, self.lock) = \
-                               [feinfo.getFrontendInfo(x) \
-                                       for x in [iFrontendInformation.signalPower, 
-                                               iFrontendInformation.signalQuality, 
-                                               iFrontendInformation.bitErrorRate, 
-                                               iFrontendInformation.lockState] ]
-
+                       self.snr = status.get("tuner_signal_power")
+                       self.snr_db = status.get("tuner_signal_power_db")
+                       self.agc = status.get("tuner_signal_quality")
+                       self.ber = status.get("tuner_bit_error_rate")
+                       self.lock = status.get("tuner_locked")
                self.changed((self.CHANGED_ALL, ))
 
-       def getFrontendInfo(self):
+       def getFrontendStatus(self):
                if self.frontend_source:
-                       return self.frontend_source()
+                       frontend = self.frontend_source()
+                       dict = { }
+                       if frontend:
+                               frontend.getFrontendStatus(dict)
+                       return dict
                elif self.service_source:
                        service = self.service_source()
-                       return service and service.frontendInfo()
+                       feinfo = service and service.frontendInfo()
+                       return feinfo and feinfo.getFrontendStatus()
                else:
                        return None
+
+       def doSuspend(self, suspended):
+               if suspended:
+                       self.poll_timer.stop()
+               else:
+                       self.poll_timer.start(self.update_interval)
+
+       def destroy(self):
+               self.poll_timer.timeout.get().remove(self.updateFrontendStatus)
+