mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-03 02:41:12 +02:00
zapit: fix cst compile
Origin commit data
------------------
Commit: 2d424639ab
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-10-15 (Fri, 15 Oct 2021)
Origin message was:
------------------
- zapit: fix cst compile
This commit is contained in:
@@ -762,7 +762,7 @@ bool CZapit::StartPip(const t_channel_id channel_id, int pip)
|
|||||||
pipVideoDecoder[0]->SetDemux(pipVideoDemux[0]);
|
pipVideoDecoder[0]->SetDemux(pipVideoDemux[0]);
|
||||||
}
|
}
|
||||||
if (CFEManager::getInstance()->getFrontendCount() > 1)
|
if (CFEManager::getInstance()->getFrontendCount() > 1)
|
||||||
cDemux::SetSource(dnum, pip_fe->getNumber());
|
cDemux::SetSource(dnum, pip_fe[pip]->getNumber());
|
||||||
#else
|
#else
|
||||||
#ifdef DYNAMIC_DEMUX
|
#ifdef DYNAMIC_DEMUX
|
||||||
int dnum = CFEManager::getInstance()->getDemux(newchannel->getTransponderId(), pip_fe[pip]->getNumber());
|
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);
|
audioDecoder->SetVideo(videoDecoder);
|
||||||
|
|
||||||
#ifdef ENABLE_PIP
|
#ifdef ENABLE_PIP
|
||||||
|
#if HAVE_CST_HARDWARE
|
||||||
|
int dnum = 1; // FIXME?
|
||||||
|
#endif
|
||||||
if (g_info.hw_caps->can_pip)
|
if (g_info.hw_caps->can_pip)
|
||||||
{
|
{
|
||||||
pipVideoDemux[0] = new cDemux(dnum);
|
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 (g_info.hw_caps->can_pip)
|
||||||
{
|
{
|
||||||
#if HAVE_CST_HARDWARE
|
#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);
|
pipVideoDecoder[0] = new cVideo(video_mode, pipVideoDemux[0]->getChannel(), pipVideoDemux[0]->getBuffer(), 1);
|
||||||
#else
|
#else
|
||||||
for (unsigned i=0; i < (unsigned int) g_info.hw_caps->pip_devs; i++)
|
for (unsigned i=0; i < (unsigned int) g_info.hw_caps->pip_devs; i++)
|
||||||
|
Reference in New Issue
Block a user