diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-05-17 13:14:15 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-05-17 13:14:15 +0000 |
| commit | bbedbd76e313e3115580d819efc608d3ad9dfc9d (patch) | |
| tree | 14622f4a3ad4cd3f2274e86f13317ad88797022e /lib/dvb | |
| parent | 3b49e3b920ae79363037857acd70a8a5d5a1c11d (diff) | |
| download | enigma2-bbedbd76e313e3115580d819efc608d3ad9dfc9d.tar.gz enigma2-bbedbd76e313e3115580d819efc608d3ad9dfc9d.zip | |
rename iFrontendStatusInformation to iFrontendInformation
add possibility to query the tuner number for playing and recording services
Diffstat (limited to 'lib/dvb')
| -rw-r--r-- | lib/dvb/frontend.cpp | 12 | ||||
| -rw-r--r-- | lib/dvb/frontend.h | 2 | ||||
| -rw-r--r-- | lib/dvb/idvb.h | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp index 1f1d17a7..fe7c8cdc 100644 --- a/lib/dvb/frontend.cpp +++ b/lib/dvb/frontend.cpp @@ -588,7 +588,7 @@ int eDVBFrontend::readFrontendData(int type) eDebug("FE_READ_SIGNAL_STRENGTH failed (%m)"); return strength; } - case Locked: + case locked: { #if HAVE_DVB_API_VERSION < 3 FrontendStatus status=0; @@ -599,7 +599,7 @@ int eDVBFrontend::readFrontendData(int type) eDebug("FE_READ_STATUS failed (%m)"); return !!(status&FE_HAS_LOCK); } - case Synced: + case synced: { #if HAVE_DVB_API_VERSION < 3 FrontendStatus status=0; @@ -610,6 +610,8 @@ int eDVBFrontend::readFrontendData(int type) eDebug("FE_READ_STATUS failed (%m)"); return !!(status&FE_HAS_SYNC); } + case frontendNumber: + return m_fe; } return 0; } @@ -966,8 +968,8 @@ PyObject *eDVBFrontend::readTransponderData(bool original) } PutToDict(ret, "tuner_state", tmp); - PutToDict(ret, "tuner_locked", readFrontendData(Locked)); - PutToDict(ret, "tuner_synced", readFrontendData(Synced)); + PutToDict(ret, "tuner_locked", readFrontendData(locked)); + PutToDict(ret, "tuner_synced", readFrontendData(synced)); PutToDict(ret, "tuner_bit_error_rate", readFrontendData(bitErrorRate)); PutToDict(ret, "tuner_signal_power", readFrontendData(signalPower)); PutToDict(ret, "tuner_signal_quality", readFrontendData(signalQuality)); @@ -1170,7 +1172,7 @@ void eDVBFrontend::tuneLoop() // called by m_tuneTimer case eSecCommand::IF_TUNER_LOCKED_GOTO: { eSecCommand::rotor &cmd = m_sec_sequence.current()->measure; - if (readFrontendData(Locked)) + if (readFrontendData(locked)) { eDebug("[SEC] locked step %d ok", cmd.okcount); ++cmd.okcount; diff --git a/lib/dvb/frontend.h b/lib/dvb/frontend.h index 2c8d89e3..ce40acd0 100644 --- a/lib/dvb/frontend.h +++ b/lib/dvb/frontend.h @@ -102,7 +102,7 @@ public: RESULT getData(int num, int &data); RESULT setData(int num, int val); - int readFrontendData(int type); // bitErrorRate, signalPower, signalQuality, Locked, Synced + int readFrontendData(int type); // bitErrorRate, signalPower, signalQuality, locked, synced PyObject *readTransponderData(bool original); int isCompatibleWith(ePtr<iDVBFrontendParameters> &feparm); diff --git a/lib/dvb/idvb.h b/lib/dvb/idvb.h index dff543ca..8b86866e 100644 --- a/lib/dvb/idvb.h +++ b/lib/dvb/idvb.h @@ -411,7 +411,7 @@ public: virtual RESULT setSecSequence(const eSecCommandList &list)=0; #endif enum { - bitErrorRate, signalPower, signalQuality, Locked, Synced + bitErrorRate, signalPower, signalQuality, locked, synced, frontendNumber }; virtual int readFrontendData(int type)=0; virtual PyObject *readTransponderData(bool original)=0; |