From f1668c58e2ffb3894f4544f50323076f496393f5 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 13 Feb 2013 13:16:46 +0400
Subject: [PATCH] zapit/src/capmt.cpp: use MAX_DMX_UNITS

---
 src/zapit/include/zapit/capmt.h | 3 ++-
 src/zapit/src/capmt.cpp         | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/zapit/include/zapit/capmt.h b/src/zapit/include/zapit/capmt.h
index 060c64b48..1b8f37898 100644
--- a/src/zapit/include/zapit/capmt.h
+++ b/src/zapit/include/zapit/capmt.h
@@ -28,6 +28,7 @@
 #include <OpenThreads/Mutex>
 #include <zapit/channel.h>
 #include <dvbsi++/ca_program_map_section.h>
+#include <dmx_cs.h>
 
 #define DEMUX_DECODE_0 1
 #define DEMUX_DECODE_1 2
@@ -47,7 +48,7 @@ class CCam : public CBasicClient
 	private:
 		virtual unsigned char getVersion(void) const;
 		virtual const char *getSocketName(void) const;
-		int camask, demuxes[4];
+		int camask, demuxes[MAX_DMX_UNITS];
 		int source_demux;
 		uint8_t cabuf[2048];
 		int calen;
diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp
index 6036ca336..1d672f268 100644
--- a/src/zapit/src/capmt.cpp
+++ b/src/zapit/src/capmt.cpp
@@ -37,7 +37,8 @@
 CCam::CCam()
 {
 	camask = 0;
-	demuxes[0] = demuxes[1] = demuxes[2] =  demuxes[3] = 0;
+	for(int i = 0; i < MAX_DMX_UNITS; i++)
+		demuxes[i] = 0;
 	source_demux = -1;
 	calen = 0;
 }
@@ -147,11 +148,11 @@ int CCam::makeMask(int demux, bool add)
 	else if(demuxes[demux] > 0)
 		demuxes[demux]--;
 
-	for(int i = 0; i < 4; i++) {
+	for(int i = 0; i < MAX_DMX_UNITS; i++) {
 		if(demuxes[i] > 0)
 			mask |= 1 << i;
 	}
-	DBG("demuxes %d:%d:%d:%d old mask %d new mask %d", demuxes[0], demuxes[1], demuxes[2], demuxes[3], camask, mask);
+	//DBG("demuxes %d:%d:%d:%d old mask %d new mask %d", demuxes[0], demuxes[1], demuxes[2], demuxes[3], camask, mask);
 	return mask;
 }