mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pip' into next

Browse Source 
Conflicts:
	src/gui/channellist.cpp
This commit is contained in:
[CST] Focus
2013-02-28 16:45:41 +04:00
parent 026592e8fe 3da1aebe27
commit 69b4d366af
22 changed files with 494 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/driver/record.cpp
View File

@@ -1613,13 +1613,21 @@ bool CRecordManager::CutBackNeutrino(const t_channel_id channel_id, CFrontend *
}
if (unlock)
CFEManager::getInstance()->unlockFrontend(live_fe);
} else {
}
#ifdef DYNAMIC_DEMUX
else {
frontend = CFEManager::getInstance()->allocateFE(channel, true);
}
printf("%s: record demux: %d\n", __FUNCTION__, channel->getRecordDemux());
if (channel->getRecordDemux() == 0)
ret = false;
#endif
if(ret) {
#ifdef BOXMODEL_APOLLO
if (CZapit::getInstance()->GetPipChannelID() == channel_id)
CZapit::getInstance()->StopPip();
#endif
if(StopSectionsd) {
printf("%s: g_Sectionsd->setPauseScanning(true)\n", __FUNCTION__);
g_Sectionsd->setPauseScanning(true);