aboutsummaryrefslogtreecommitdiff
path: root/lib/dvb/frontend.cpp
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-03-11 17:19:57 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-03-11 17:19:57 +0000
commitcc89d218402e01a1dc381a50130c6e3581a3555f (patch)
tree4682b33219cc79196d0fbaef9a61a7248bb7ef7a /lib/dvb/frontend.cpp
parent9212670199a1ac1713c4386eeeaf7991e8cddf8f (diff)
downloadenigma2-cc89d218402e01a1dc381a50130c6e3581a3555f.tar.gz
enigma2-cc89d218402e01a1dc381a50130c6e3581a3555f.zip
fix linked tuner
Diffstat (limited to 'lib/dvb/frontend.cpp')
-rw-r--r--lib/dvb/frontend.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/dvb/frontend.cpp b/lib/dvb/frontend.cpp
index 7b71ca13..5d991a47 100644
--- a/lib/dvb/frontend.cpp
+++ b/lib/dvb/frontend.cpp
@@ -1454,6 +1454,8 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
{
eDebug("(%d)tune", m_fe);
+ m_timeout->stop();
+
int res=0;
if (m_type == -1)
@@ -1483,7 +1485,10 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
return -EINVAL;
res=prepare_cable(feparm);
if (!res)
+ {
+ m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+ }
break;
}
case feTerrestrial:
@@ -1496,7 +1501,10 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
}
res=prepare_terrestrial(feparm);
if (!res)
+ {
+ m_sec_sequence.push_back( eSecCommand(eSecCommand::START_TUNE_TIMEOUT) );
m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+ }
break;
}
}
@@ -1504,7 +1512,6 @@ RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
if (!res) // prepare ok
{
m_tuneTimer->start(0,true);
- m_timeout->stop();
m_sec_sequence.current() = m_sec_sequence.begin();
if (m_state != stateTuning)