From b9bda8a0d43be892f2e5d96ea45ba8d4b2fdae20 Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Mon, 15 Jan 2007 15:51:19 +0000 Subject: change iFrontendInformation api getFrontendData(bool) is now splitted in three seperate calls getFrontendData() returns the frontend number and frontend type in a dict getFrontendStatus() return signal quality, signal power, bit error rate, lock state, sync state, frontend state in a dict getTransponderData(bool) when the bool is true it returns a dict with the original tuned transponder data, when false the transponderdata read out from the frontend driver getAll(bool) is a sum of the three single calls and the direct replacement of the old getFrontendData call --- lib/python/Components/Sources/FrontendStatus.py | 26 +++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'lib/python/Components/Sources/FrontendStatus.py') diff --git a/lib/python/Components/Sources/FrontendStatus.py b/lib/python/Components/Sources/FrontendStatus.py index 352b9fdc..d9311771 100644 --- a/lib/python/Components/Sources/FrontendStatus.py +++ b/lib/python/Components/Sources/FrontendStatus.py @@ -16,25 +16,27 @@ class FrontendStatus(Source): self.snr = self.agc = self.ber = self.lock = None def updateFrontendStatus(self): - feinfo = self.getFrontendInfo() - if feinfo is None: + print "updateFrontendStatus" + 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.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() + if frontend: + dict = { } + frontend.getFrontendStatus(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 -- cgit v1.2.3