git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use parent service reference for query EPG to build a .eit file when a parent is...
[enigma2.git]
/
lib
/
dvb
/
frontend.cpp
diff --git
a/lib/dvb/frontend.cpp
b/lib/dvb/frontend.cpp
index 7b71ca13ac5a6d0b17aa8179e1731fb00464b154..5d991a474d60cc4671d04189c42c6354ea9e4fb1 100644
(file)
--- 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);
{
eDebug("(%d)tune", m_fe);
+ m_timeout->stop();
+
int res=0;
if (m_type == -1)
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)
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) );
m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+ }
break;
}
case feTerrestrial:
break;
}
case feTerrestrial:
@@
-1496,7
+1501,10
@@
RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
}
res=prepare_terrestrial(feparm);
if (!res)
}
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) );
m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
+ }
break;
}
}
break;
}
}
@@
-1504,7
+1512,6
@@
RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
if (!res) // prepare ok
{
m_tuneTimer->start(0,true);
if (!res) // prepare ok
{
m_tuneTimer->start(0,true);
- m_timeout->stop();
m_sec_sequence.current() = m_sec_sequence.begin();
if (m_state != stateTuning)
m_sec_sequence.current() = m_sec_sequence.begin();
if (m_state != stateTuning)