From: Felix Domke Date: Thu, 19 Jan 2006 12:54:21 +0000 (+0000) Subject: make comment a bit more generic X-Git-Tag: 2.6.0~4361 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/0bc1ee8c40769cf8c48b56dcc4c9e5987b8cd20a?ds=sidebyside make comment a bit more generic --- diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp index 364787ac..8c89a16f 100644 --- a/lib/dvb/dvb.cpp +++ b/lib/dvb/dvb.cpp @@ -304,7 +304,8 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse if(channelid==cache_chan->getChannelID()) { eDebug("use cached_channel"); - channel=m_cached_channel; + channel = m_cached_channel; + m_cached_channel->recheckFrontendState(); return 0; } m_cached_channel=0; @@ -591,16 +592,16 @@ void eDVBChannel::frontendStateChanged(iDVBFrontend*fe) ourstate = state_tuning; } else if (state == iDVBFrontend::stateLostLock) { + /* on managed channels, we try to retune in order to re-acquire lock. */ if (m_feparm) { - eDebug("OURSTATE: lost lock.. retune"); + eDebug("OURSTATE: lost lock, trying to retune"); 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)