From ca57c77d77170c9b3755c968ebcfa1bc55e21f60 Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Sun, 24 Feb 2013 17:45:21 +0100
Subject: [PATCH] capmt: fix demux selection on spark

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/cdd60c360028247a20edc54800795a6e1d9ba595
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
---
 src/zapit/src/capmt.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp
index 9a4af5284..42ce0a446 100644
--- a/src/zapit/src/capmt.cpp
+++ b/src/zapit/src/capmt.cpp
@@ -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();