projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_274_disable_fast_winding_for_non_ts' into experimental
[vuplus_dvbapp]
/
lib
/
dvb
/
frontend.cpp
diff --git
a/lib/dvb/frontend.cpp
b/lib/dvb/frontend.cpp
index
0319c4c
..
c0263fb
100644
(file)
--- a/
lib/dvb/frontend.cpp
+++ b/
lib/dvb/frontend.cpp
@@
-604,7
+604,7
@@
int eDVBFrontend::closeFrontend(bool force)
setVoltage(iDVBFrontend::voltageOff);
m_tuneTimer->stop();
if (m_sec && !m_simulate)
setVoltage(iDVBFrontend::voltageOff);
m_tuneTimer->stop();
if (m_sec && !m_simulate)
- m_sec->setRotorMoving(false);
+ m_sec->setRotorMoving(
m_slotid,
false);
if (!::close(m_fd))
m_fd=-1;
else
if (!::close(m_fd))
m_fd=-1;
else
@@
-804,7
+804,7
@@
int eDVBFrontend::readFrontendData(int type)
ret = (int)(snr_in_db * 100);
}
else if (strstr(m_description, "Alps BSBE1 C01A") ||
ret = (int)(snr_in_db * 100);
}
else if (strstr(m_description, "Alps BSBE1 C01A") ||
-
!strcmp
(m_description, "Alps -S(STV0288)"))
+
strstr
(m_description, "Alps -S(STV0288)"))
{
if (snr == 0)
ret = 0;
{
if (snr == 0)
ret = 0;
@@
-1694,12
+1694,12
@@
void eDVBFrontend::tuneLoop() // called by m_tuneTimer
break;
case eSecCommand::SET_ROTOR_MOVING:
if (!m_simulate)
break;
case eSecCommand::SET_ROTOR_MOVING:
if (!m_simulate)
- m_sec->setRotorMoving(true);
+ m_sec->setRotorMoving(
m_slotid,
true);
++m_sec_sequence.current();
break;
case eSecCommand::SET_ROTOR_STOPPED:
if (!m_simulate)
++m_sec_sequence.current();
break;
case eSecCommand::SET_ROTOR_STOPPED:
if (!m_simulate)
- m_sec->setRotorMoving(false);
+ m_sec->setRotorMoving(
m_slotid,
false);
++m_sec_sequence.current();
break;
case eSecCommand::IF_INPUTPOWER_DELTA_GOTO:
++m_sec_sequence.current();
break;
case eSecCommand::IF_INPUTPOWER_DELTA_GOTO:
@@
-2344,7
+2344,7
@@
RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
goto tune_error;
}
if (!m_simulate)
goto tune_error;
}
if (!m_simulate)
- m_sec->setRotorMoving(false);
+ m_sec->setRotorMoving(
m_slotid,
false);
res=prepare_sat(feparm, timeout);
if (res)
goto tune_error;
res=prepare_sat(feparm, timeout);
if (res)
goto tune_error;