add needed functions

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

diff --git a/lib/dvb/dvb.cpp b/lib/dvb/dvb.cpp
index aa7958126f2a707e3ccbe4279ee7b45f40de4306..0a5bb45e3b189fb65b6fa2904b7473f6ca5976ff 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;
        
@@ -367,7 +380,10 @@ RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, in
 RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)
 {
        ePtr<eDVBAllocatedDemux> demux;
-       
+
+       if (m_cached_channel)
+               m_cached_channel=0;
+
        eDVBChannel *ch;
        ch = new eDVBChannel(this, 0);
        
@@ -444,7 +460,7 @@ bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, con
                if (i->m_channel_id == ignore)
                {
                        eDVBChannel *channel = (eDVBChannel*) &(*i->m_channel);
-                       if (channel->getUseCount() == 1)  // channel only used once..
+                       if (channel == &(*m_cached_channel) ? channel->getUseCount() == 2 : channel->getUseCount() == 1)  // channel only used once..
                        {
                                ePtr<iDVBFrontend> fe;
                                if (!i->m_channel->getFrontend(fe))