From 29d7f897afe70cdacb31f087a7017b39d0f1f29e Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Mon, 25 Mar 2013 13:34:37 +0400 Subject: [PATCH] zapit/src/femanager.cpp: move pip demux set source to zapit.cpp --- src/zapit/src/femanager.cpp | 2 +- src/zapit/src/zapit.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/zapit/src/femanager.cpp b/src/zapit/src/femanager.cpp index a09cec1ba..956ce7798 100644 --- a/src/zapit/src/femanager.cpp +++ b/src/zapit/src/femanager.cpp @@ -642,7 +642,7 @@ CFrontend * CFEManager::allocateFE(CZapitChannel * channel, bool forrecord) /* FIXME until proper demux management */ if (enabled_count < 4) { channel->setPipDemux(PIP_DEMUX); - cDemux::SetSource(PIP_DEMUX, frontend->fenumber); + //cDemux::SetSource(PIP_DEMUX, frontend->fenumber); } INFO("pip demux: %d", channel->getPipDemux()); #endif diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index 3c4758808..6e7a9750a 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -615,6 +615,7 @@ bool CZapit::StartPip(const t_channel_id channel_id) pipDemux->Open(DMX_PIP_CHANNEL); pipDecoder->SetDemux(pipDemux); } + cDemux::SetSource(dnum, pip_fe->getNumber()); #if 0 pipDecoder->SetSyncMode(AVSYNC_DISABLED); pipDemux->SetSyncMode(AVSYNC_DISABLED);