git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
05ee19b
)
remove debug
author
Felix Domke
<tmbinc@elitedvb.net>
Sun, 15 Jan 2006 12:06:44 +0000
(12:06 +0000)
committer
Felix Domke
<tmbinc@elitedvb.net>
Sun, 15 Jan 2006 12:06:44 +0000
(12:06 +0000)
lib/dvb/dvb.cpp
patch
|
blob
|
history
diff --git
a/lib/dvb/dvb.cpp
b/lib/dvb/dvb.cpp
index 57db24626338962596969f820f41ee7e7545d629..f20ce8a286d9a64d3d88d7622837717e69ffdf9f 100644
(file)
--- a/
lib/dvb/dvb.cpp
+++ b/
lib/dvb/dvb.cpp
@@
-671,7
+671,6
@@
RESULT eDVBChannel::setCIRouting(const eDVBCIRouting &routing)
RESULT eDVBChannel::getDemux(ePtr<iDVBDemux> &demux, int cap)
{
RESULT eDVBChannel::getDemux(ePtr<iDVBDemux> &demux, int cap)
{
- eDebug("get %d demux", cap);
ePtr<eDVBAllocatedDemux> &our_demux = (cap & capDecode) ? m_decoder_demux : m_demux;
if (!our_demux)
ePtr<eDVBAllocatedDemux> &our_demux = (cap & capDecode) ? m_decoder_demux : m_demux;
if (!our_demux)
@@
-680,14
+679,12
@@
RESULT eDVBChannel::getDemux(ePtr<iDVBDemux> &demux, int cap)
if (m_mgr->allocateDemux(m_frontend ? (eDVBRegisteredFrontend*)*m_frontend : (eDVBRegisteredFrontend*)0, our_demux, cap))
return -1;
if (m_mgr->allocateDemux(m_frontend ? (eDVBRegisteredFrontend*)*m_frontend : (eDVBRegisteredFrontend*)0, our_demux, cap))
return -1;
-
}
demux = *our_demux;
}
demux = *our_demux;
+ /* don't hold a reference to the decoding demux, we don't need it. */
if (cap & capDecode)
if (cap & capDecode)
- {
our_demux = 0;
our_demux = 0;
- }
return 0;
}
return 0;
}