X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b9bda8a0d43be892f2e5d96ea45ba8d4b2fdae20..f03c85f8c3575d22eb065313857d8d3e57960e95:/lib/python/Components/Sources/FrontendStatus.py

diff --git a/lib/python/Components/Sources/FrontendStatus.py b/lib/python/Components/Sources/FrontendStatus.py
index d9311771..5eb3445f 100644
--- a/lib/python/Components/Sources/FrontendStatus.py
+++ b/lib/python/Components/Sources/FrontendStatus.py
@@ -1,38 +1,40 @@
 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, True)
 
 	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):
-		print "updateFrontendStatus"
 		status = self.getFrontendStatus()
 		if not status:
 			self.invalidate()
 		else:
-			self.snr = status.get("tuner_signal_power")
-			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, ))
+		self.poll_timer.start(self.update_interval, True)
 
 	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 +46,9 @@ 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)
+		Source.destroy(self)