X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e20b7ae7457cc6016f57cb66be2652afb72eb14d..2e0270746af934180499931f95ed91c444c8233e:/lib/dvb/sec.cpp diff --git a/lib/dvb/sec.cpp b/lib/dvb/sec.cpp index 1e75d113..9270a619 100644 --- a/lib/dvb/sec.cpp +++ b/lib/dvb/sec.cpp @@ -262,7 +262,7 @@ bool need_turn_fast(int turn_speed) { int begin = turn_speed >> 16; // high word is start time int end = turn_speed&0xFFFF; // low word is end time - time_t now_time = eDVBLocalTimeHandler::getInstance()->nowTime(); + time_t now_time = ::time(0); tm nowTime; localtime_r(&now_time, &nowTime); int now = (nowTime.tm_hour + 1) * 60 + nowTime.tm_min + 1; @@ -280,7 +280,7 @@ bool need_turn_fast(int turn_speed) #define VOLTAGE(x) (lnb_param.m_increased_voltage ? iDVBFrontend::voltage##x##_5 : iDVBFrontend::voltage##x) -RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int slot_id) +RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPARAMETERS &parm, const eDVBFrontendParametersSatellite &sat, int slot_id, unsigned int tunetimeout) { for (int idx=0; idx <= m_lnbidx; ++idx ) { @@ -788,7 +788,7 @@ RESULT eDVBSatelliteEquipmentControl::prepare(iDVBFrontend &frontend, FRONTENDPA if (doSetFrontend) { - sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) ); + sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT, tunetimeout) ); sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) ); } frontend.setSecSequence(sec_sequence);