mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit/src/zapit.cpp: remove PIP_DEMUX usage

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: c4dc143934
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-28 (Fri, 28 Mar 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2014-03-28 14:15:06 +04:00
parent ccff399561
commit 663bb0c48c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/zapit/src/zapit.cpp
View File

@@ -645,6 +645,9 @@ bool CZapit::StartPip(const t_channel_id channel_id)
if (pipDemux && (pipDemux->getUnit() != dnum)) { if (pipDemux && (pipDemux->getUnit() != dnum)) {
pipDecoder->SetDemux(NULL); pipDecoder->SetDemux(NULL);
delete pipDemux; delete pipDemux;
pipDemux = NULL;
}
if (!pipDemux) {
pipDemux = new cDemux(dnum); pipDemux = new cDemux(dnum);
pipDemux->Open(DMX_PIP_CHANNEL); pipDemux->Open(DMX_PIP_CHANNEL);
pipDecoder->SetDemux(pipDemux); pipDecoder->SetDemux(pipDemux);
@@ -2264,8 +2267,6 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
#ifdef ENABLE_PIP #ifdef ENABLE_PIP
/* FIXME until proper demux management */ /* FIXME until proper demux management */
int dnum = 1; int dnum = 1;
if (CFEManager::getInstance()->getFrontendCount() < MAX_DMX_UNITS)
dnum = PIP_DEMUX;
#endif #endif
#ifdef BOXMODEL_APOLLO #ifdef BOXMODEL_APOLLO
videoDecoder = cVideo::GetDecoder(0); videoDecoder = cVideo::GetDecoder(0);