git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 aa7958126f2a707e3ccbe4279ee7b45f40de4306..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)
{
eDVBAllocatedFrontend::eDVBAllocatedFrontend(eDVBRegisteredFrontend *fe): m_fe(fe)
{
- m_fe->
m_inuse++
;
+ m_fe->
inc_use()
;
}
eDVBAllocatedFrontend::~eDVBAllocatedFrontend()
{
}
eDVBAllocatedFrontend::~eDVBAllocatedFrontend()
{
-
--m_fe->m_inuse
;
+
m_fe->dec_use()
;
}
DEFINE_REF(eDVBAllocatedDemux);
}
DEFINE_REF(eDVBAllocatedDemux);
@@
-200,8
+200,6
@@
void eDVBResourceManager::addAdapter(iDVBAdapter *adapter)
if (!adapter->getFrontend(frontend, i))
{
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));
}
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. */
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)
{
// 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 = 0;
return errChidNotFound;
}
- channel = ch;
+
m_cached_channel =
channel = ch;
return 0;
}
return 0;
}
@@
-353,6
+363,9
@@
RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, in
{
ePtr<eDVBAllocatedFrontend> fe;
{
ePtr<eDVBAllocatedFrontend> fe;
+ if (m_cached_channel)
+ m_cached_channel=0;
+
if (allocateFrontendByIndex(fe, frontend_index))
return errNoFrontend;
if (allocateFrontendByIndex(fe, frontend_index))
return errNoFrontend;
@@
-444,7
+457,7
@@
bool eDVBResourceManager::canAllocateChannel(const eDVBChannelID &channelid, con
if (i->m_channel_id == ignore)
{
eDVBChannel *channel = (eDVBChannel*) &(*i->m_channel);
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))
{
ePtr<iDVBFrontend> fe;
if (!i->m_channel->getFrontend(fe))