git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
copy lists, not list identities... should fix saving of non-default values
[enigma2.git]
/
lib
/
dvb
/
frontend.cpp
diff --git
a/lib/dvb/frontend.cpp
b/lib/dvb/frontend.cpp
index a4a94a213de8fe78ac3537de8424d3a52385ba2c..99cafe75340c73b63396ebdfdeba03a7622b36d4 100644
(file)
--- a/
lib/dvb/frontend.cpp
+++ b/
lib/dvb/frontend.cpp
@@
-400,9
+400,7
@@
void eDVBFrontend::feEvent(int w)
else
{
state = stateLostLock;
else
{
state = stateLostLock;
-
- if (m_state != stateLostLock)
- eDebug("FIXME: we lost lock, so we might have to retune.");
+ m_data[0] = m_data[1] = m_data[2] = -1; // reset diseqc
}
}
if (m_state != state)
}
}
if (m_state != state)
@@
-415,19
+413,12
@@
void eDVBFrontend::feEvent(int w)
void eDVBFrontend::timeout()
{
void eDVBFrontend::timeout()
{
-
int state
;
+
m_tuning = 0
;
if (m_state == stateTuning)
{
if (m_state == stateTuning)
{
- state = stateFailed;
- eDebug("DVBFrontend: timeout");
- if (m_state != state)
- {
- m_state = state;
- m_stateChanged(this);
- }
- m_tuning = 0;
- } else
- m_tuning = 0;
+ m_state = stateFailed;
+ m_stateChanged(this);
+ }
}
int eDVBFrontend::readFrontendData(int type)
}
int eDVBFrontend::readFrontendData(int type)
@@
-671,13
+662,6
@@
void eDVBFrontend::setFrontend()
perror("FE_SET_FRONTEND failed");
return;
}
perror("FE_SET_FRONTEND failed");
return;
}
-
- if (m_state != stateTuning)
- {
- m_tuning = 1;
- m_state = stateTuning;
- m_stateChanged(this);
- }
m_timeout->start(5000, 1); // 5 sec timeout. TODO: symbolrate dependent
}
m_timeout->start(5000, 1); // 5 sec timeout. TODO: symbolrate dependent
}
@@
-950,8
+934,16
@@
RESULT eDVBFrontend::tune(const iDVBFrontendParameters &where)
m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
m_tuneTimer->start(0,true);
m_sec_sequence.push_back( eSecCommand(eSecCommand::SET_FRONTEND) );
m_tuneTimer->start(0,true);
+ m_timeout->stop();
m_sec_sequence.current() = m_sec_sequence.begin();
m_sec_sequence.current() = m_sec_sequence.begin();
+ if (m_state != stateTuning)
+ {
+ m_tuning = 1;
+ m_state = stateTuning;
+ m_stateChanged(this);
+ }
+
return 0;
}
return 0;
}