mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

capmt: fix demux selection on spark

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: cdd60c3600
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-02-24 (Sun, 24 Feb 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-02-24 17:45:21 +01:00
parent f5816d4cdc
commit ca57c77d77
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/zapit/src/capmt.cpp
View File

@@ -29,6 +29,9 @@
#include <zapit/debug.h>
#include <ca_cs.h>
#ifndef HAVE_COOL_HARDWARE
#include <dmx_td.h>
#endif
#include <dvbsi++/program_map_section.h>
#include <dvbsi++/ca_program_map_section.h>
@@ -207,17 +210,27 @@ bool CCamManager::SetMode(t_channel_id channel_id, enum runmode mode, bool start
switch(mode) {
case PLAY:
#if HAVE_COOL_HARDWARE
source = DEMUX_SOURCE_0;
demux = LIVE_DEMUX;
#else
/* see the comment in src/driver/streamts.cpp:CStreamInstance::run() */
case STREAM:
/* this might be SPARK-specific, not tested elsewhere */
source = cDemux::GetSource(0); /* demux0 is always the live demux */
demux = source;
#endif
break;
case RECORD:
source = channel->getRecordDemux(); //DEMUX_SOURCE_0;//FIXME
demux = channel->getRecordDemux(); //RECORD_DEMUX;//FIXME
break;
#if HAVE_COOL_HARDWARE
case STREAM:
source = DEMUX_SOURCE_0;
demux = STREAM_DEMUX;//FIXME
break;
#endif
}
oldmask = cam->getCaMask();