From fa7e0945e8f0cf79be00de9e52b005b755bb6534 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 15 Oct 2021 14:55:29 +0200 Subject: [PATCH] zapit: fix cst compile Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/2d424639abce97216ca78f1e7163221a62164576 Author: vanhofen Date: 2021-10-15 (Fri, 15 Oct 2021) Origin message was: ------------------ - zapit: fix cst compile --- src/zapit/src/zapit.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index 4211a2563..1b6cf840a 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -762,7 +762,7 @@ bool CZapit::StartPip(const t_channel_id channel_id, int pip) pipVideoDecoder[0]->SetDemux(pipVideoDemux[0]); } if (CFEManager::getInstance()->getFrontendCount() > 1) - cDemux::SetSource(dnum, pip_fe->getNumber()); + cDemux::SetSource(dnum, pip_fe[pip]->getNumber()); #else #ifdef DYNAMIC_DEMUX int dnum = CFEManager::getInstance()->getDemux(newchannel->getTransponderId(), pip_fe[pip]->getNumber()); @@ -2603,6 +2603,9 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg) audioDecoder->SetVideo(videoDecoder); #ifdef ENABLE_PIP +#if HAVE_CST_HARDWARE + int dnum = 1; // FIXME? +#endif if (g_info.hw_caps->can_pip) { pipVideoDemux[0] = new cDemux(dnum); @@ -2626,8 +2629,6 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg) if (g_info.hw_caps->can_pip) { #if HAVE_CST_HARDWARE - pipVideoDemux[0] = new cDemux(dnum); - pipVideoDemux[0]->Open(DMX_PIP_CHANNEL); pipVideoDecoder[0] = new cVideo(video_mode, pipVideoDemux[0]->getChannel(), pipVideoDemux[0]->getBuffer(), 1); #else for (unsigned i=0; i < (unsigned int) g_info.hw_caps->pip_devs; i++)