From 4067f2a9a5e2e788c7dd4c4c5cd06024537840f9 Mon Sep 17 00:00:00 2001 From: ghost Date: Mon, 1 Mar 2010 22:58:54 +0100 Subject: [PATCH] lib/dvb/sec.cpp: remove not needed satpos depends check when the tuner is linked to another (in use) tuner this fixes bug #422 and https://www.dream-multimedia-tv.de/board/index.php?page=Thread&threadID=11843&highlight= --- lib/dvb/sec.cpp | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp index 44cbe709..8b6bc491 100644 --- a/lib/dvb/sec.cpp +++ b/lib/dvb/sec.cpp @@ -175,21 +175,6 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite else ret += 15; eSecDebugNoSimulate("ret2 %d", ret); - if (ret) // special case when this tuner is linked to a satpos dependent tuner - { - fe->getData(eDVBFrontend::SATPOS_DEPENDS_PTR, satpos_depends_ptr); - if (satpos_depends_ptr != -1) - { - eDVBRegisteredFrontend *satpos_depends_to_fe = (eDVBRegisteredFrontend*) satpos_depends_ptr; - satpos_depends_to_fe->m_frontend->getData(eDVBFrontend::ROTOR_POS, rotor_pos); - if (!rotor || rotor_pos == -1 /* we dont know the rotor position yet */ - || rotor_pos != sat.orbital_position ) // not the same orbital position? - { - ret = 0; - } - } - } - eSecDebugNoSimulate("ret3 %d", ret); } else if (satpos_depends_ptr != -1) { @@ -215,8 +200,12 @@ int eDVBSatelliteEquipmentControl::canTune(const eDVBFrontendParametersSatellite ret = 0; } } - eSecDebugNoSimulate("ret4 %d", ret); + eSecDebugNoSimulate("ret3 %d", ret); } + else if (!direct_connected) + ret = 0; + + eSecDebugNoSimulate("ret4 %d", ret); if (ret && rotor && rotor_pos != -1) ret -= abs(rotor_pos-sat.orbital_position); -- 2.30.2