git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
set frontend state to stateTuning when tuneloop starts.. ( to avoid false lostlock...
[enigma2.git]
/
lib
/
dvb
/
dvb.cpp
diff --git
a/lib/dvb/dvb.cpp
b/lib/dvb/dvb.cpp
index 364787ac8f9a4f860fae8e03e6bce13f74769add..8af8bb0ed706d2a5b9007d1dddb4dc153546a016 100644
(file)
--- a/
lib/dvb/dvb.cpp
+++ b/
lib/dvb/dvb.cpp
@@
-304,7
+304,7
@@
RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse
if(channelid==cache_chan->getChannelID())
{
eDebug("use cached_channel");
if(channelid==cache_chan->getChannelID())
{
eDebug("use cached_channel");
- channel
=
m_cached_channel;
+ channel
=
m_cached_channel;
return 0;
}
m_cached_channel=0;
return 0;
}
m_cached_channel=0;
@@
-591,16
+591,16
@@
void eDVBChannel::frontendStateChanged(iDVBFrontend*fe)
ourstate = state_tuning;
} else if (state == iDVBFrontend::stateLostLock)
{
ourstate = state_tuning;
} else if (state == iDVBFrontend::stateLostLock)
{
+ /* on managed channels, we try to retune in order to re-acquire lock. */
if (m_feparm)
{
if (m_feparm)
{
- eDebug("OURSTATE: lost lock
..
retune");
+ eDebug("OURSTATE: lost lock
, trying to
retune");
ourstate = state_tuning;
m_frontend->get().tune(*m_feparm);
ourstate = state_tuning;
m_frontend->get().tune(*m_feparm);
- }
- else // this case happens in scan.. in scan setChannel is not used .. so m_feparm is NULL
- // but its okay.. in scan we dont like to retune
+ } else
+ /* on unmanaged channels, we don't do this. the client will do this. */
{
{
- eDebug("OURSTATE: lost lock
.. but no feparm avail.. set state_unavailable
");
+ eDebug("OURSTATE: lost lock
, unavailable now.
");
ourstate = state_unavailable;
}
} else if (state == iDVBFrontend::stateFailed)
ourstate = state_unavailable;
}
} else if (state == iDVBFrontend::stateFailed)