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 linked tuners
[enigma2.git]
/
lib
/
dvb
/
dvb.cpp
diff --git
a/lib/dvb/dvb.cpp
b/lib/dvb/dvb.cpp
index 8feb3c184f4094293bd07c14f4d3d6ec75f686bc..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)
{
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));
}
@@
-365,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;
@@
-379,7
+380,10
@@
RESULT eDVBResourceManager::allocateRawChannel(eUsePtr<iDVBChannel> &channel, in
RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)
{
ePtr<eDVBAllocatedDemux> demux;
RESULT eDVBResourceManager::allocatePVRChannel(eUsePtr<iDVBPVRChannel> &channel)
{
ePtr<eDVBAllocatedDemux> demux;
-
+
+ if (m_cached_channel)
+ m_cached_channel=0;
+
eDVBChannel *ch;
ch = new eDVBChannel(this, 0);
eDVBChannel *ch;
ch = new eDVBChannel(this, 0);