diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-05-22 13:19:24 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-05-22 13:19:24 +0000 |
| commit | 961fcb6cec16091f610dec1f019d43b6096e7390 (patch) | |
| tree | f272022790a76a77a32997e20f9a7d81a80cb004 /lib/dvb/sec.cpp | |
| parent | 9d8d1436be9d8c9c5b79089a288b9716e4a098b9 (diff) | |
| download | enigma2-961fcb6cec16091f610dec1f019d43b6096e7390.tar.gz enigma2-961fcb6cec16091f610dec1f019d43b6096e7390.zip | |
do not ask to scan on tuner 0 when not needed
Diffstat (limited to 'lib/dvb/sec.cpp')
| -rw-r--r-- | lib/dvb/sec.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp index 2a35ba14..f91824dc 100644 --- a/lib/dvb/sec.cpp +++ b/lib/dvb/sec.cpp @@ -1113,6 +1113,7 @@ PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int t else if (cnt == tu2) p2 = *it; } + if (p1 && p2) { // check for linked tuners @@ -1145,10 +1146,12 @@ PyObject *eDVBSatelliteEquipmentControl::get_exclusive_satellites(int tu1, int t int tmp2=-1; // check for rotor dependency p1->m_frontend->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, tmp1); + if (tmp1 != -1) + p1 = (void*)tmp1; p2->m_frontend->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, tmp2); - if (tmp1 != -1 && (void*)tmp1 != p2 - && tmp2 != -1 && (void*)tmp2 != p1 - && tmp1 != tmp2 ) + if (tmp2 != -1) + p2 = (void*)tmp2; + if (p1 != p2) { int tu1_mask = 1 << p1->m_frontend->getID(), tu2_mask = 1 << p2->m_frontend->getID(); |