From 6ec87214f2c4a40fb0c598d4f7371f45614364bf Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Sun, 24 Feb 2013 12:51:24 +0100
Subject: [PATCH 1/7] libspark/hw_caps: add more stb ids

from git://gitorious.org/~martii/neutrino-hd/martiis-libstb-hal.git
---
 libspark/hardware_caps.c | 64 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/libspark/hardware_caps.c b/libspark/hardware_caps.c
index dda67aa..b012dc4 100644
--- a/libspark/hardware_caps.c
+++ b/libspark/hardware_caps.c
@@ -50,6 +50,10 @@ hw_caps_t *get_hwcaps(void)
 		if (p && sscanf(p, "STB_ID=%x:%x:%x:", &h0, &h1, &h2) == 3) {
 			int sys_id = (h0 << 16) | (h1 << 8) | h2;
 			switch (sys_id) {
+				case 0x090003:
+					tmp = "Truman Premier 1+";
+					caps.has_SCART = 1;
+					break;
 				case 0x090007:
 					tmp = "GoldenMedia GM990";
 					caps.has_SCART = 1;
@@ -65,10 +69,70 @@ hw_caps_t *get_hwcaps(void)
 					tmp = "GalaxyInnovations S8120";
 					caps.has_SCART = 1;
 					break;
+				case 0x09000d:
+					tmp = "Dynavision Spark";
+					caps.has_SCART = 1;
+					break;
+				case 0x09000e:
+					tmp = "SAB Unix F+ Solo (S902)";
+					caps.has_SCART = 1;
+					break;
+				case 0x090015:
+					tmp = "Superbox S 750 HD";
+					caps.has_SCART = 1;
+					break;
+				case 0x09001d:
+					tmp = "Fulan Spark I+";
+					caps.has_SCART = 1;
+					break;
+				case 0x090020:
+					tmp = "SAMSAT LINUX 1";
+					caps.has_SCART = 1;
+					break;
+				case 0x090021:
+					tmp = "Visionnet Hammer 5400"; // or Startrack SRT 2020 HD, or Visionnet Fireball 101
+					caps.has_SCART = 1;
+					break;
+				case 0x0c0003:
+					tmp = "Truman Top Box 2";
+					caps.has_SCART = 1;
+					break;
 				case 0x0c0007:
 					tmp = "GoldenMedia Triplex";
 					caps.has_SCART = 1;
 					break;
+				case 0x0c000a:
+					tmp = "Amiko Alien 2";
+					caps.has_SCART = 1;
+					break;
+				case 0x0c000b:
+					tmp = "GalaxyInnovations Avatar 3 (8820)";
+					caps.has_SCART = 1;
+					break;
+				case 0x0c000d:
+					tmp = "Dynavision 7162";
+					caps.has_SCART = 1;
+					break;
+				case 0x0c000e:
+					tmp = "SAB Unix Triple HD (S903)";
+					caps.has_SCART = 1;
+					break;
+				case 0x0c001d:
+					tmp = "Satcom 7162";
+					caps.has_SCART = 1;
+					break;
+				case 0x0c0020:
+					tmp = "Samsat 7162";
+					caps.has_SCART = 1;
+					break;
+				case 0x0c0021:
+					tmp = "Visionnet Falcon";
+					caps.has_SCART = 1;
+					break;
+				case 0x0c002b00:
+					tmp = "Icecrypt S3700 CHD";
+					caps.has_SCART = 1;
+					break;
 				default:
 					tmp = p;
 			}

From 70979f4df34c47419f2e319754409603d556b71d Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Sun, 24 Feb 2013 13:07:54 +0100
Subject: [PATCH 2/7] spark_fp: add options for setting led status

from git://gitorious.org/~martii/neutrino-hd/martiis-libstb-hal.git
---
 tools/spark_fp.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/tools/spark_fp.c b/tools/spark_fp.c
index 73cbeed..61b7c8e 100644
--- a/tools/spark_fp.c
+++ b/tools/spark_fp.c
@@ -42,6 +42,8 @@ void usage()
 	printf("\t-t: get current FP time\n");
 	printf("\t-s <time>: set FP time (time = 0: use current time)\n");
 	printf("\t-w <time>: set FP wakeup time and power down (time = 1: no wakeup)\n");
+	printf("\t-l <n>: set LED <n> on\n");
+	printf("\t-L <n>: set LED <n> off\n");
 	printf("times are given in unix time (UTC, seconds since 1970-01-01 00:00:00)\n");
 	printf("\n");
 }
@@ -136,7 +138,7 @@ int main(int argc, char **argv)
 	}
 
 	ret = 0;
-	while ((c = getopt (argc, argv, "gs:tw:T")) != -1)
+	while ((c = getopt (argc, argv, "gs:tw:Tl:L:")) != -1)
 	{
 		switch (c)
 		{
@@ -220,6 +222,16 @@ int main(int argc, char **argv)
 				 */
 				sleep(2); /* not reached... */
 				break;
+			case 'l': /* LED on */
+				aotom.u.led.on = LOG_ON;
+				aotom.u.led.led_nr = atoi(optarg);
+				ioctl(fd, VFDSETLED, &aotom);
+				break;
+			case 'L': /* LED off */
+				aotom.u.led.on = LOG_OFF;
+				aotom.u.led.led_nr = atoi(optarg);
+				ioctl(fd, VFDSETLED, &aotom);
+				break;
 			case 'T':
 				ret = ioctl(fd, VFDGETVERSION, &val);
 				if (ret < 0)

From 74cb82e66cd76e50c0875d5f4564393dc19f440b Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Sun, 24 Feb 2013 13:26:55 +0100
Subject: [PATCH 3/7] cDemux::sectionFilter: fix invalid length calculation

---
 azbox/dmx.cpp        | 3 +--
 generic-pc/dmx.cpp   | 3 +--
 libspark/dmx.cpp     | 3 +--
 libtriple/dmx_td.cpp | 6 +++---
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/azbox/dmx.cpp b/azbox/dmx.cpp
index 099901a..7130597 100644
--- a/azbox/dmx.cpp
+++ b/azbox/dmx.cpp
@@ -277,13 +277,12 @@ bool cDemux::sectionFilter(unsigned short pid, const unsigned char * const filte
 			   const unsigned char * const mask, int len, int timeout,
 			   const unsigned char * const negmask)
 {
-	int length = len;
 	memset(&s_flt, 0, sizeof(s_flt));
 
 	if (len > DMX_FILTER_SIZE)
 	{
 		lt_info("%s #%d: len too long: %d, DMX_FILTER_SIZE %d\n", __func__, num, len, DMX_FILTER_SIZE);
-		length = DMX_FILTER_SIZE;
+		len = DMX_FILTER_SIZE;
 	}
 	s_flt.pid = pid;
 	s_flt.timeout = timeout;
diff --git a/generic-pc/dmx.cpp b/generic-pc/dmx.cpp
index 7a61a90..9d15091 100644
--- a/generic-pc/dmx.cpp
+++ b/generic-pc/dmx.cpp
@@ -247,13 +247,12 @@ bool cDemux::sectionFilter(unsigned short pid, const unsigned char * const filte
 			   const unsigned char * const mask, int len, int timeout,
 			   const unsigned char * const negmask)
 {
-	int length = len;
 	memset(&s_flt, 0, sizeof(s_flt));
 
 	if (len > DMX_FILTER_SIZE)
 	{
 		lt_info("%s #%d: len too long: %d, DMX_FILTER_SIZE %d\n", __func__, num, len, DMX_FILTER_SIZE);
-		length = DMX_FILTER_SIZE;
+		len = DMX_FILTER_SIZE;
 	}
 	s_flt.pid = pid;
 	s_flt.timeout = timeout;
diff --git a/libspark/dmx.cpp b/libspark/dmx.cpp
index cf88aa0..142b84a 100644
--- a/libspark/dmx.cpp
+++ b/libspark/dmx.cpp
@@ -357,7 +357,6 @@ bool cDemux::sectionFilter(unsigned short pid, const unsigned char * const filte
 			   const unsigned char * const mask, int len, int timeout,
 			   const unsigned char * const negmask)
 {
-	int length = len;
 	memset(&s_flt, 0, sizeof(s_flt));
 
 	_open();
@@ -365,7 +364,7 @@ bool cDemux::sectionFilter(unsigned short pid, const unsigned char * const filte
 	if (len > DMX_FILTER_SIZE)
 	{
 		lt_info("%s #%d: len too long: %d, DMX_FILTER_SIZE %d\n", __func__, num, len, DMX_FILTER_SIZE);
-		length = DMX_FILTER_SIZE;
+		len = DMX_FILTER_SIZE;
 	}
 	s_flt.pid = pid;
 	s_flt.timeout = timeout;
diff --git a/libtriple/dmx_td.cpp b/libtriple/dmx_td.cpp
index 3c4b1e1..073b2cd 100644
--- a/libtriple/dmx_td.cpp
+++ b/libtriple/dmx_td.cpp
@@ -349,12 +349,12 @@ bool cDemux::sectionFilter(unsigned short pid, const unsigned char * const filte
 	s_flt.filter[0] = filter[0];
 	s_flt.mask[0] = mask[0];
 	s_flt.timeout = timeout;
-	memcpy(&s_flt.filter[3], &filter[1], len - 1);
-	memcpy(&s_flt.mask[3],   &mask[1],   len - 1);
+	memcpy(&s_flt.filter[3], &filter[1], length - 1);
+	memcpy(&s_flt.mask[3],   &mask[1],   length - 1);
 	if (negmask != NULL)
 	{
 		s_flt.positive[0] = negmask[0];
-		memcpy(&s_flt.positive[3], &negmask[1], len - 1);
+		memcpy(&s_flt.positive[3], &negmask[1], length - 1);
 	}
 
 	s_flt.flags = XPDF_IMMEDIATE_START;

From 707020d16b489b0a2b3cad261dece0dfe8a39414 Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Sun, 24 Feb 2013 13:35:31 +0100
Subject: [PATCH 4/7] cDemux: add copyright header

---
 azbox/dmx.cpp        | 21 +++++++++++++++++++++
 generic-pc/dmx.cpp   | 22 ++++++++++++++++++++++
 libspark/dmx.cpp     | 12 ++++++++++--
 libtriple/dmx_td.cpp | 19 +++++++++++++++++++
 4 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/azbox/dmx.cpp b/azbox/dmx.cpp
index 7130597..fcd1e90 100644
--- a/azbox/dmx.cpp
+++ b/azbox/dmx.cpp
@@ -1,3 +1,24 @@
+/*
+ * cDemux implementation for azbox receivers (tested on azbox me and minime)
+ *
+ * derived from libtriple/dmx_td.cpp
+ *
+ * (C) 2010-2013 Stefan Seyfried
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "config.h"
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/generic-pc/dmx.cpp b/generic-pc/dmx.cpp
index 9d15091..1cc4359 100644
--- a/generic-pc/dmx.cpp
+++ b/generic-pc/dmx.cpp
@@ -1,3 +1,25 @@
+/*
+ * cDemux implementation for generic dvbapi
+ *
+ * derived from libtriple/dmx_td.cpp
+ *
+ * (C) 2010-2013 Stefan Seyfried
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
 #include "config.h"
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/libspark/dmx.cpp b/libspark/dmx.cpp
index 142b84a..50ef058 100644
--- a/libspark/dmx.cpp
+++ b/libspark/dmx.cpp
@@ -1,15 +1,23 @@
 /*
  * cDemux implementation for SH4 receivers (tested on fulan spark and
- * fulan spark7162 hardware
+ * fulan spark7162 hardware)
  *
  * derived from libtriple/dmx_td.cpp
  *
- * (C) 2010-2012 Stefan Seyfried
+ * (C) 2010-2013 Stefan Seyfried
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/libtriple/dmx_td.cpp b/libtriple/dmx_td.cpp
index 073b2cd..f3549f6 100644
--- a/libtriple/dmx_td.cpp
+++ b/libtriple/dmx_td.cpp
@@ -1,3 +1,22 @@
+/*
+ * cDemux implementation for the Tripledragon dbs3000 receiver
+ *
+ * (C) 2010-2013 Stefan Seyfried
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

From e900236f7edf2ffdc85b97b3032231012cb1b4b8 Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Sun, 24 Feb 2013 14:11:09 +0100
Subject: [PATCH 5/7] cDemux: fix removePid / pesfds usage

---
 azbox/dmx.cpp      | 33 +++++-------------------
 generic-pc/dmx.cpp | 34 +++++-------------------
 libspark/dmx.cpp   | 64 ++++------------------------------------------
 3 files changed, 17 insertions(+), 114 deletions(-)

diff --git a/azbox/dmx.cpp b/azbox/dmx.cpp
index fcd1e90..a4ab3b1 100644
--- a/azbox/dmx.cpp
+++ b/azbox/dmx.cpp
@@ -162,14 +162,6 @@ void cDemux::Close(void)
 		return;
 	}
 
-	for (std::vector<pes_pids>::const_iterator i = pesfds.begin(); i != pesfds.end(); ++i)
-	{
-		lt_debug("%s stopping and closing demux fd %d pid 0x%04x\n", __FUNCTION__, (*i).fd, (*i).pid);
-		if (ioctl((*i).fd, DMX_STOP) < 0)
-			perror("DEMUX_STOP");
-		if (close((*i).fd) < 0)
-			perror("close");
-	}
 	pesfds.clear();
 	ioctl(fd, DMX_STOP);
 	close(fd);
@@ -195,13 +187,6 @@ bool cDemux::Start(bool)
 		lt_info("%s #%d: not open!\n", __FUNCTION__, num);
 		return false;
 	}
-
-	for (std::vector<pes_pids>::const_iterator i = pesfds.begin(); i != pesfds.end(); ++i)
-	{
-		lt_debug("%s starting demux fd %d pid 0x%04x\n", __FUNCTION__, (*i).fd, (*i).pid);
-		if (ioctl((*i).fd, DMX_START) < 0)
-			perror("DMX_START");
-	}
 	ioctl(fd, DMX_START);
 	return true;
 }
@@ -214,12 +199,6 @@ bool cDemux::Stop(void)
 		lt_info("%s #%d: not open!\n", __FUNCTION__, num);
 		return false;
 	}
-	for (std::vector<pes_pids>::const_iterator i = pesfds.begin(); i != pesfds.end(); ++i)
-	{
-		lt_debug("%s stopping demux fd %d pid 0x%04x\n", __FUNCTION__, (*i).fd, (*i).pid);
-		if (ioctl((*i).fd, DMX_STOP) < 0)
-			perror("DMX_STOP");
-	}
 	ioctl(fd, DMX_STOP);
 	return true;
 }
@@ -474,7 +453,6 @@ bool cDemux::addPid(unsigned short Pid)
 	lt_debug("%s: pid 0x%04hx\n", __func__, Pid);
 	pes_pids pfd;
 	int ret;
-	struct dmx_pes_filter_params p;
 	if (dmx_type != DMX_TP_CHANNEL)
 	{
 		lt_info("%s pes_type %s not implemented yet! pid=%hx\n", __FUNCTION__, DMX_T[dmx_type], Pid);
@@ -482,6 +460,9 @@ bool cDemux::addPid(unsigned short Pid)
 	}
 	if (fd == -1)
 		lt_info("%s bucketfd not yet opened? pid=%hx\n", __FUNCTION__, Pid);
+	pfd.fd = fd; /* dummy */
+	pfd.pid = Pid;
+	pesfds.push_back(pfd);
 	ret = (ioctl(fd, DMX_ADD_PID, &Pid));
 	if (ret < 0)
 		lt_info("%s: DMX_ADD_PID (%m)\n", __func__);
@@ -498,11 +479,9 @@ void cDemux::removePid(unsigned short Pid)
 	for (std::vector<pes_pids>::iterator i = pesfds.begin(); i != pesfds.end(); ++i)
 	{
 		if ((*i).pid == Pid) {
-			lt_debug("removePid: removing demux fd %d pid 0x%04x\n", (*i).fd, Pid);
-			if (ioctl((*i).fd, DMX_STOP) < 0)
-				perror("DMX_STOP");
-			if (close((*i).fd) < 0)
-				perror("close");
+			lt_debug("removePid: removing demux fd %d pid 0x%04x\n", fd, Pid);
+			if (ioctl(fd, DMX_REMOVE_PID, Pid) < 0)
+				lt_info("%s: (DMX_REMOVE_PID, 0x%04hx): %m\n", __func__, Pid);
 			pesfds.erase(i);
 			return; /* TODO: what if the same PID is there multiple times */
 		}
diff --git a/generic-pc/dmx.cpp b/generic-pc/dmx.cpp
index 1cc4359..7a59928 100644
--- a/generic-pc/dmx.cpp
+++ b/generic-pc/dmx.cpp
@@ -146,15 +146,6 @@ void cDemux::Close(void)
 		lt_info("%s #%d: not open!\n", __FUNCTION__, num);
 		return;
 	}
-
-	for (std::vector<pes_pids>::const_iterator i = pesfds.begin(); i != pesfds.end(); ++i)
-	{
-		lt_debug("%s stopping and closing demux fd %d pid 0x%04x\n", __FUNCTION__, (*i).fd, (*i).pid);
-		if (ioctl((*i).fd, DMX_STOP) < 0)
-			perror("DEMUX_STOP");
-		if (close((*i).fd) < 0)
-			perror("close");
-	}
 	pesfds.clear();
 	ioctl(fd, DMX_STOP);
 	close(fd);
@@ -180,13 +171,6 @@ bool cDemux::Start(bool)
 		lt_info("%s #%d: not open!\n", __FUNCTION__, num);
 		return false;
 	}
-
-	for (std::vector<pes_pids>::const_iterator i = pesfds.begin(); i != pesfds.end(); ++i)
-	{
-		lt_debug("%s starting demux fd %d pid 0x%04x\n", __FUNCTION__, (*i).fd, (*i).pid);
-		if (ioctl((*i).fd, DMX_START) < 0)
-			perror("DMX_START");
-	}
 	ioctl(fd, DMX_START);
 	return true;
 }
@@ -199,12 +183,6 @@ bool cDemux::Stop(void)
 		lt_info("%s #%d: not open!\n", __FUNCTION__, num);
 		return false;
 	}
-	for (std::vector<pes_pids>::const_iterator i = pesfds.begin(); i != pesfds.end(); ++i)
-	{
-		lt_debug("%s stopping demux fd %d pid 0x%04x\n", __FUNCTION__, (*i).fd, (*i).pid);
-		if (ioctl((*i).fd, DMX_STOP) < 0)
-			perror("DMX_STOP");
-	}
 	ioctl(fd, DMX_STOP);
 	return true;
 }
@@ -443,7 +421,6 @@ bool cDemux::addPid(unsigned short Pid)
 	lt_debug("%s: pid 0x%04hx\n", __func__, Pid);
 	pes_pids pfd;
 	int ret;
-	struct dmx_pes_filter_params p;
 	if (dmx_type != DMX_TP_CHANNEL)
 	{
 		lt_info("%s pes_type %s not implemented yet! pid=%hx\n", __FUNCTION__, DMX_T[dmx_type], Pid);
@@ -451,6 +428,9 @@ bool cDemux::addPid(unsigned short Pid)
 	}
 	if (fd == -1)
 		lt_info("%s bucketfd not yet opened? pid=%hx\n", __FUNCTION__, Pid);
+	pfd.fd = fd; /* dummy */
+	pfd.pid = Pid;
+	pesfds.push_back(pfd);
 	ret = (ioctl(fd, DMX_ADD_PID, &Pid));
 	if (ret < 0)
 		lt_info("%s: DMX_ADD_PID (%m)\n", __func__);
@@ -467,11 +447,9 @@ void cDemux::removePid(unsigned short Pid)
 	for (std::vector<pes_pids>::iterator i = pesfds.begin(); i != pesfds.end(); ++i)
 	{
 		if ((*i).pid == Pid) {
-			lt_debug("removePid: removing demux fd %d pid 0x%04x\n", (*i).fd, Pid);
-			if (ioctl((*i).fd, DMX_STOP) < 0)
-				perror("DMX_STOP");
-			if (close((*i).fd) < 0)
-				perror("close");
+			lt_debug("removePid: removing demux fd %d pid 0x%04x\n", fd, Pid);
+			if (ioctl(fd, DMX_REMOVE_PID, Pid) < 0)
+				lt_info("%s: (DMX_REMOVE_PID, 0x%04hx): %m\n", __func__, Pid);
 			pesfds.erase(i);
 			return; /* TODO: what if the same PID is there multiple times */
 		}
diff --git a/libspark/dmx.cpp b/libspark/dmx.cpp
index 50ef058..332e107 100644
--- a/libspark/dmx.cpp
+++ b/libspark/dmx.cpp
@@ -226,14 +226,6 @@ void cDemux::Close(void)
 		return;
 	}
 
-	for (std::vector<pes_pids>::const_iterator i = pesfds.begin(); i != pesfds.end(); ++i)
-	{
-		lt_debug("%s stopping and closing demux fd %d pid 0x%04x\n", __FUNCTION__, (*i).fd, (*i).pid);
-		if (ioctl((*i).fd, DMX_STOP) < 0)
-			perror("DEMUX_STOP");
-		if (close((*i).fd) < 0)
-			perror("close");
-	}
 	pesfds.clear();
 	ioctl(fd, DMX_STOP);
 	close(fd);
@@ -258,13 +250,6 @@ bool cDemux::Start(bool)
 		lt_info("%s #%d: not open!\n", __FUNCTION__, num);
 		return false;
 	}
-
-	for (std::vector<pes_pids>::const_iterator i = pesfds.begin(); i != pesfds.end(); ++i)
-	{
-		lt_debug("%s starting demux fd %d pid 0x%04x\n", __FUNCTION__, (*i).fd, (*i).pid);
-		if (ioctl((*i).fd, DMX_START) < 0)
-			perror("DMX_START");
-	}
 	ioctl(fd, DMX_START);
 	return true;
 }
@@ -276,12 +261,6 @@ bool cDemux::Stop(void)
 		lt_info("%s #%d: not open!\n", __FUNCTION__, num);
 		return false;
 	}
-	for (std::vector<pes_pids>::const_iterator i = pesfds.begin(); i != pesfds.end(); ++i)
-	{
-		lt_debug("%s stopping demux fd %d pid 0x%04x\n", __FUNCTION__, (*i).fd, (*i).pid);
-		if (ioctl((*i).fd, DMX_STOP) < 0)
-			perror("DMX_STOP");
-	}
 	ioctl(fd, DMX_STOP);
 	return true;
 }
@@ -546,7 +525,6 @@ bool cDemux::addPid(unsigned short Pid)
 	lt_debug("%s: pid 0x%04hx\n", __func__, Pid);
 	pes_pids pfd;
 	int ret;
-	struct dmx_pes_filter_params p;
 	if (dmx_type != DMX_TP_CHANNEL)
 	{
 		lt_info("%s pes_type %s not implemented yet! pid=%hx\n", __FUNCTION__, DMX_T[dmx_type], Pid);
@@ -555,39 +533,9 @@ bool cDemux::addPid(unsigned short Pid)
 	_open();
 	if (fd == -1)
 		lt_info("%s bucketfd not yet opened? pid=%hx\n", __FUNCTION__, Pid);
-#if 0
-	pfd.fd = open(devname[num], O_RDWR);
-	if (pfd.fd < 0)
-	{
-		lt_info("%s #%d Pid = %hx open failed (%m)\n", __FUNCTION__, num, Pid);
-		return false;
-	}
-	fcntl(pfd.fd, F_SETFD, FD_CLOEXEC);
-	lt_debug("%s #%d Pid = %hx pfd = %d\n", __FUNCTION__, num, Pid, pfd.fd);
-
-	p.pid = Pid;
-	p.input    = DMX_IN_FRONTEND;
-	p.pes_type = DMX_PES_OTHER;
-	p.output   = DMX_OUT_TS_TAP;
-	p.flags    = 0;
-
-	ret = ioctl(pfd.fd, DMX_SET_BUFFER_SIZE, 0x10000); // 64k
-	if (ret == -1)
-		perror("DMX_SET_BUFFER_SIZE");
-	else
-	{
-		ret = ioctl(pfd.fd, DMX_SET_PES_FILTER, &p);
-		if (ret == -1)
-			perror("DEMUX_FILTER_PES_SET");
-	}
+	pfd.fd = fd; /* dummy */
 	pfd.pid = Pid;
-	if (ret != -1)
-		/* success! */
-		pesfds.push_back(pfd);
-	else
-		/* error! */
-		close(pfd.fd);
-#endif
+	pesfds.push_back(pfd);
 	ret = (ioctl(fd, DMX_ADD_PID, &Pid));
 	if (ret < 0)
 		lt_info("%s: DMX_ADD_PID (%m)\n", __func__);
@@ -604,11 +552,9 @@ void cDemux::removePid(unsigned short Pid)
 	for (std::vector<pes_pids>::iterator i = pesfds.begin(); i != pesfds.end(); ++i)
 	{
 		if ((*i).pid == Pid) {
-			lt_debug("removePid: removing demux fd %d pid 0x%04x\n", (*i).fd, Pid);
-			if (ioctl((*i).fd, DMX_STOP) < 0)
-				perror("DMX_STOP");
-			if (close((*i).fd) < 0)
-				perror("close");
+			lt_debug("removePid: removing demux fd %d pid 0x%04x\n", fd, Pid);
+			if (ioctl(fd, DMX_REMOVE_PID, Pid) < 0)
+				lt_info("%s: (DMX_REMOVE_PID, 0x%04hx): %m\n", __func__, Pid);
 			pesfds.erase(i);
 			return; /* TODO: what if the same PID is there multiple times */
 		}

From afdca9c02b582ba59101313ca845986d0af7b9a9 Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Sun, 24 Feb 2013 16:29:59 +0100
Subject: [PATCH 6/7] implement cDemux::GetSource()

---
 azbox/dmx.cpp        |  6 ++++++
 azbox/dmx_lib.h      |  1 +
 generic-pc/dmx.cpp   |  6 ++++++
 generic-pc/dmx_lib.h |  1 +
 libspark/dmx.cpp     | 10 ++++++++++
 libspark/dmx_lib.h   |  1 +
 libtriple/dmx_td.h   |  1 +
 7 files changed, 26 insertions(+)

diff --git a/azbox/dmx.cpp b/azbox/dmx.cpp
index a4ab3b1..1fe5561 100644
--- a/azbox/dmx.cpp
+++ b/azbox/dmx.cpp
@@ -514,3 +514,9 @@ bool cDemux::SetSource(int unit, int source)
 	lt_info_c("%s(%d, %d): not implemented yet\n", __func__, unit, source);
 	return true;
 }
+
+int cDemux::GetSource(int unit)
+{
+	lt_info_c("%s(%d): not implemented yet\n", __func__, unit);
+	return 0;
+}
diff --git a/azbox/dmx_lib.h b/azbox/dmx_lib.h
index ffd293e..ed38048 100644
--- a/azbox/dmx_lib.h
+++ b/azbox/dmx_lib.h
@@ -55,6 +55,7 @@ class cDemux
 		void getSTC(int64_t * STC);
 		int getUnit(void);
 		static bool SetSource(int unit, int source);
+		static int GetSource(int unit);
 		// TD only functions
 		int getFD(void) { return fd; };		/* needed by cPlayback class */
 		void removePid(unsigned short Pid);	/* needed by cRecord class */
diff --git a/generic-pc/dmx.cpp b/generic-pc/dmx.cpp
index 7a59928..91525fd 100644
--- a/generic-pc/dmx.cpp
+++ b/generic-pc/dmx.cpp
@@ -477,3 +477,9 @@ bool cDemux::SetSource(int unit, int source)
 	lt_info_c("%s(%d, %d): not implemented yet\n", __func__, unit, source);
 	return true;
 }
+
+int cDemux::GetSource(int unit)
+{
+	lt_info_c("%s(%d): not implemented yet\n", __func__, unit);
+	return 0;
+}
diff --git a/generic-pc/dmx_lib.h b/generic-pc/dmx_lib.h
index ffd293e..ed38048 100644
--- a/generic-pc/dmx_lib.h
+++ b/generic-pc/dmx_lib.h
@@ -55,6 +55,7 @@ class cDemux
 		void getSTC(int64_t * STC);
 		int getUnit(void);
 		static bool SetSource(int unit, int source);
+		static int GetSource(int unit);
 		// TD only functions
 		int getFD(void) { return fd; };		/* needed by cPlayback class */
 		void removePid(unsigned short Pid);	/* needed by cRecord class */
diff --git a/libspark/dmx.cpp b/libspark/dmx.cpp
index 332e107..75aa87a 100644
--- a/libspark/dmx.cpp
+++ b/libspark/dmx.cpp
@@ -595,3 +595,13 @@ bool cDemux::SetSource(int unit, int source)
 		dmx_source[unit] = source;
 	return true;
 }
+
+int cDemux::GetSource(int unit)
+{
+	if (unit >= NUM_DEMUX || unit < 0) {
+		lt_info_c("%s: unit (%d) out of range, NUM_DEMUX %d\n", __func__, unit, NUM_DEMUX);
+		return -1;
+	}
+	lt_info_c("%s(%d) => %d\n", __func__, unit, dmx_source[unit]);
+	return dmx_source[unit];
+}
diff --git a/libspark/dmx_lib.h b/libspark/dmx_lib.h
index 99ac526..e85dc3c 100644
--- a/libspark/dmx_lib.h
+++ b/libspark/dmx_lib.h
@@ -57,6 +57,7 @@ class cDemux
 		void getSTC(int64_t * STC);
 		int getUnit(void);
 		static bool SetSource(int unit, int source);
+		static int GetSource(int unit);
 		// TD only functions
 		int getFD(void) { return fd; };		/* needed by cPlayback class */
 		void removePid(unsigned short Pid);	/* needed by cRecord class */
diff --git a/libtriple/dmx_td.h b/libtriple/dmx_td.h
index 4b35ece..e657592 100644
--- a/libtriple/dmx_td.h
+++ b/libtriple/dmx_td.h
@@ -63,6 +63,7 @@ class cDemux
 		int getUnit(void);
 		/* tripledragon is unlikely to get a second tuner, so stub it out right here */
 		static bool SetSource(int /*unit*/, int /*source*/) { return true; };
+		static int GetSource(int /*unit*/) { return 0; };
 		// TD only functions
 		int getFD(void) { return fd; };		/* needed by cPlayback class */
 		void removePid(unsigned short Pid);	/* needed by cRecord class */

From 4b9d9271b60d79268ff281dd606fdd17ab60d2c7 Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Sun, 24 Feb 2013 16:31:37 +0100
Subject: [PATCH 7/7] spark: fix compiler warning in cVideo

---
 libspark/video.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/libspark/video.cpp b/libspark/video.cpp
index 6cb7228..91f14f1 100644
--- a/libspark/video.cpp
+++ b/libspark/video.cpp
@@ -1,10 +1,10 @@
 /*
  * (C) 2002-2003 Andreas Oberritter <obi@tuxbox.org>
- * (C) 2010-2011 Stefan Seyfried
+ * (C) 2010-2013 Stefan Seyfried
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, 51 Franklin Street, Suite 500 Boston, MA 02110-1335 USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <fcntl.h>
@@ -495,7 +494,6 @@ int cVideo::getBlank(void)
 	size_t n = 0;
 	ssize_t r;
 	char *line = NULL;
-	char *p;
 	/* hack: the "mailbox" irq is not increasing if
 	 * no audio or video is decoded... */
 	FILE *f = fopen("/proc/interrupts", "r");