remove recheckFrontendState until it's implemented

[enigma2.git] / lib / dvb / dvb.cpp

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 32e19308fb561f4a230b5dfe8603aaec986eacb3..dcdac7ef86c063d12bf24e89bb9253eb0b902909 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");
-                       channel=m_cached_channel;
+                       channel = m_cached_channel;
                        return 0;
                }
                m_cached_channel=0;
@@ -591,9 +591,18 @@ void eDVBChannel::frontendStateChanged(iDVBFrontend*fe)
                ourstate = state_tuning;
        } else if (state == iDVBFrontend::stateLostLock)
        {
-               eDebug("OURSTATE: lost lock.. retune");
-               ourstate = state_tuning;
-               m_frontend->get().tune(*m_feparm);
+                       /* on managed channels, we try to retune in order to re-acquire lock. */
+               if (m_feparm)
+               {
+                       eDebug("OURSTATE: lost lock, trying to retune");
+                       ourstate = state_tuning;
+                       m_frontend->get().tune(*m_feparm);
+               } else
+                       /* on unmanaged channels, we don't do this. the client will do this. */
+               {
+                       eDebug("OURSTATE: lost lock, unavailable now.")
+                       ourstate = state_unavailable;
+               }
        } else if (state == iDVBFrontend::stateFailed)
        {
                eDebug("OURSTATE: failed");