projects
/
vuplus_dvbapp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c1b1596
)
dvb.cpp: another dm500hd/dm800 demux policy fix
author
ghost
<andreas.monzner@multimedia-labs.de>
Sun, 31 May 2009 15:50:58 +0000
(17:50 +0200)
committer
ghost
<andreas.monzner@multimedia-labs.de>
Sun, 31 May 2009 15:51:21 +0000
(17:51 +0200)
lib/dvb/dvb.cpp
patch
|
blob
|
history
diff --git
a/lib/dvb/dvb.cpp
b/lib/dvb/dvb.cpp
index
3c2c22a
..
d30be29
100644
(file)
--- a/
lib/dvb/dvb.cpp
+++ b/
lib/dvb/dvb.cpp
@@
-438,14
+438,24
@@
RESULT eDVBResourceManager::allocateDemux(eDVBRegisteredFrontend *fe, ePtr<eDVBA
if (!unused)
unused = i;
}
if (!unused)
unused = i;
}
- else if (!fe || (i->m_adapter == fe->m_adapter &&
- i->m_demux->getSource() == fe->m_frontend->getDVBID()))
+ else
{
{
- demux = new eDVBAllocatedDemux(i);
- return 0;
+ if (fe)
+ {
+ if (i->m_adapter == fe->m_adapter &&
+ i->m_demux->getSource() == fe->m_frontend->getDVBID())
+ {
+ demux = new eDVBAllocatedDemux(i);
+ return 0;
+ }
+ }
+ else if (i->m_demux->getSource() == -1) // PVR
+ {
+ demux = new eDVBAllocatedDemux(i);
+ return 0;
+ }
}
}
}
}
-
}
else if (m_demux.size() < 5) // ATI
{
}
else if (m_demux.size() < 5) // ATI
{