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

driver/streamts.cpp: use record demux, deny streaming if pip running

Browse Source
This commit is contained in:
[CST] Focus
2013-03-25 13:36:58 +04:00
parent 305455e004
commit 698b56c6db
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/driver/streamts.cpp
View File

@@ -162,8 +162,14 @@ void CStreamInstance::run()
{ {
printf("CStreamInstance::run: %llx\n", channel_id); printf("CStreamInstance::run: %llx\n", channel_id);
#if 0
dmx = new cDemux(STREAM_DEMUX);//FIXME dmx = new cDemux(STREAM_DEMUX);//FIXME
#endif
CZapitChannel * tmpchan = CServiceManager::getInstance()->FindChannel(channel_id);
if (!tmpchan)
return;
dmx = new cDemux(tmpchan->getRecordDemux());//FIXME
dmx->Open(DMX_TP_CHANNEL, NULL, DMX_BUFFER_SIZE); dmx->Open(DMX_TP_CHANNEL, NULL, DMX_BUFFER_SIZE);
/* pids here cannot be empty */ /* pids here cannot be empty */
@@ -350,6 +356,13 @@ bool CStreamManager::Parse(int fd, stream_pids_t &pids, t_channel_id &chid)
printf("CStreamManager::Parse: channel %llx recorded, aborting..\n", chid); printf("CStreamManager::Parse: channel %llx recorded, aborting..\n", chid);
return false; return false;
} }
#ifdef ENABLE_PIP
t_channel_id pip_channel_id = CZapit::getInstance()->GetPipChannelID();
if ((chid == pip_channel_id) && (channel->getRecordDemux() == channel->getPipDemux())) {
printf("CStreamManager::Parse: channel %llx used for pip, aborting..\n", chid);
return false;
}
#endif
#endif #endif
printf("CStreamManager::Parse: no pids in url, using channel %llx pids\n", chid); printf("CStreamManager::Parse: no pids in url, using channel %llx pids\n", chid);