fix allocateRAWChannel (we must first give free the cached channel)

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

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index 4107c22dc89e65fcfd5f82e2850df56f1a4d16ec..ac5c1a5e024c25f859ab070d65e8bf7843b02bc0 100644 (file)
--- a/lib/dvb/dvb.cpp
+++ b/lib/dvb/dvb.cpp
@@ -18,12 +18,12 @@ DEFINE_REF(eDVBAllocatedFrontend);
 
 eDVBAllocatedFrontend::eDVBAllocatedFrontend(eDVBRegisteredFrontend *fe): m_fe(fe)
 {
-       m_fe->m_inuse++;
+       m_fe->inc_use();
 }
 
 eDVBAllocatedFrontend::~eDVBAllocatedFrontend()
 {
-       --m_fe->m_inuse;
+       m_fe->dec_use();
 }
 
 DEFINE_REF(eDVBAllocatedDemux);
@@ -200,8 +200,6 @@ void eDVBResourceManager::addAdapter(iDVBAdapter *adapter)
 
                if (!adapter->getFrontend(frontend, i))
                {
-                       frontend->setTone(iDVBFrontend::toneOff);
-                       frontend->setVoltage(iDVBFrontend::voltageOff);
                        frontend->setSEC(m_sec);
                        m_frontend.push_back(new eDVBRegisteredFrontend(frontend, adapter));
                }
@@ -299,7 +297,19 @@ RESULT eDVBResourceManager::getChannelList(ePtr<iDVBChannelList> &list)
 RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUsePtr<iDVBChannel> &channel)
 {
                /* first, check if a channel is already existing. */
-       
+
+       if (m_cached_channel)
+       {
+               eDVBChannel *cache_chan = (eDVBChannel*)&(*m_cached_channel);
+               if(channelid==cache_chan->getChannelID())
+               {
+                       eDebug("use cached_channel");
+                       channel=m_cached_channel;
+                       return 0;
+               }
+               m_cached_channel=0;
+       }
+
 //     eDebug("allocate channel.. %04x:%04x", channelid.transport_stream_id.get(), channelid.original_network_id.get());
        for (std::list<active_channel>::iterator i(m_active_channels.begin()); i != m_active_channels.end(); ++i)
        {
@@ -344,7 +354,7 @@ RESULT eDVBResourceManager::allocateChannel(const eDVBChannelID &channelid, eUse
                channel = 0;
                return errChidNotFound;
        }
-       channel = ch;
+       m_cached_channel = channel = ch;
 
        return 0;
 }
@@ -353,6 +363,9 @@ RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, in
 {
        ePtr<eDVBAllocatedFrontend> fe;
 
+       if (m_cached_channel)
+               m_cached_channel=0;
+
        if (allocateFrontendByIndex(fe, frontend_index))
                return errNoFrontend;
        
@@ -406,14 +419,13 @@ RESULT eDVBResourceManager::connectChannelAdded(const Slot1<void,eDVBChannel*> &
        return 0;
 }
 
-bool eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm, int used_tuner_mask)
+bool eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &feparm)
 {
-       eDebug("canAllocateFrontend mask %08x", used_tuner_mask);
        ePtr<eDVBRegisteredFrontend> best;
        int bestval = 0;
 
        for (eSmartPtrList<eDVBRegisteredFrontend>::iterator i(m_frontend.begin()); i != m_frontend.end(); ++i)
-               if ( !(used_tuner_mask & (1<<i->m_frontend->getID())) )
+               if (!i->m_inuse)
                {
                        int c = i->m_frontend->isCompatibleWith(feparm);
                        if (c > bestval)
@@ -423,16 +435,11 @@ bool eDVBResourceManager::canAllocateFrontend(ePtr<iDVBFrontendParameters> &fepa
        return bestval>0;
 }
 
-bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid)
+bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, const eDVBChannelID& ignore)
 {
-       return true;
-#if 0
-       int used_tuner_mask=0;
-
                /* first, check if a channel is already existing. */
 //     eDebug("allocate channel.. %04x:%04x", channelid.transport_stream_id.get(), channelid.original_network_id.get());
-       int cnt=0;
-       for (std::list<active_channel>::iterator i(m_active_channels.begin()); i != m_active_channels.end(); ++i, ++cnt)
+       for (std::list<active_channel>::iterator i(m_active_channels.begin()); i != m_active_channels.end(); ++i)
        {
 //             eDebug("available channel.. %04x:%04x", i->m_channel_id.transport_stream_id.get(), i->m_channel_id.original_network_id.get());
                if (i->m_channel_id == channelid)
@@ -440,28 +447,33 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid)
 //                     eDebug("found shared channel..");
                        return true;
                }
+       }
 
-               eDebug("activeChannel %d, NonDecoderDemux %p, DecoderDemux %p",
-                       cnt, i->m_channel->getNonDecoderDemux(), i->m_channel->getDecoderDemux() );
-               if ( i->m_channel->getNonDecoderDemux() )
+       int *decremented_fe_usecount=NULL;
+
+       for (std::list<active_channel>::iterator i(m_active_channels.begin()); i != m_active_channels.end(); ++i)
+       {
+//             eDebug("available channel.. %04x:%04x", i->m_channel_id.transport_stream_id.get(), i->m_channel_id.original_network_id.get());
+               if (i->m_channel_id == ignore)
                {
-                       ePtr<iDVBFrontend> fe;
-                       if (!i->m_channel->getFrontend(fe))
+                       eDVBChannel *channel = (eDVBChannel*) &(*i->m_channel);
+                       if (channel == &(*m_cached_channel) ? channel->getUseCount() == 2 : channel->getUseCount() == 1)  // channel only used once..
                        {
-                               if (fe)
+                               ePtr<iDVBFrontend> fe;
+                               if (!i->m_channel->getFrontend(fe))
                                {
                                        for (eSmartPtrList<eDVBRegisteredFrontend>::iterator ii(m_frontend.begin()); ii != m_frontend.end(); ++ii)
                                        {
                                                if ( &(*fe) == &(*ii->m_frontend) )
                                                {
-                                                       used_tuner_mask |= (1 << ii->m_frontend->getID());
+                                                       --ii->m_inuse;
+                                                       decremented_fe_usecount = &ii->m_inuse;
                                                        break;
                                                }
                                        }
                                }
-                               else
-                                       eDebug("fe kaputt");
                        }
+                       break;
                }
        }
 
@@ -478,8 +490,12 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid)
                return false;
        }
 
-       return canAllocateFrontend(feparm, used_tuner_mask);
-#endif
+       bool ret = canAllocateFrontend(feparm);
+
+       if (decremented_fe_usecount)
+               ++(*decremented_fe_usecount);
+
+       return ret;
 }
 
 DEFINE_REF(eDVBChannel);