From e3d8ee0286cf35a36b30ec1ea005c34b77d57181 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 25 Jan 2012 17:49:23 +0400
Subject: [PATCH] channel: remove CCaPmt

Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/4e97f0aa1e7443be46691dabe37ae195f83fa56a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-25 (Wed, 25 Jan 2012)
---
 src/zapit/include/zapit/channel.h | 12 +++++++-----
 src/zapit/src/channel.cpp         |  6 ++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/zapit/include/zapit/channel.h b/src/zapit/include/zapit/channel.h
index 46e4bd6ac..4f6f0acbe 100644
--- a/src/zapit/include/zapit/channel.h
+++ b/src/zapit/include/zapit/channel.h
@@ -32,7 +32,6 @@
 #include <set>
 
 /* zapit */
-#include "ci.h"
 #include "types.h"
 //#include <zapit/audio.h>
 
@@ -149,9 +148,10 @@ class CZapitChannel
 		unsigned char			serviceType;
 
 		/* the conditional access program map table of this channel */
-		CCaPmt * 			caPmt;
+		//CCaPmt * 			caPmt;
 		unsigned char			* rawPmt;
 		int				pmtLen;
+		uint8_t				pmt_version;
 
 		/* from neutrino CChannel class */
 		uint64_t			last_unlocked_EPGid;
@@ -206,8 +206,9 @@ class CZapitChannel
 		unsigned short		getPrivatePid(void)		{ return privatePid; }
 		unsigned short		getPreAudioPid(void)		{ return audioPid; }
 		bool			getPidsFlag(void)		{ return pidsFlag; }
-		CCaPmt *		getCaPmt(void)			{ return caPmt; }
+		//CCaPmt *		getCaPmt(void)			{ return caPmt; }
 		unsigned char *		getRawPmt(int &len)		{ len = pmtLen; return rawPmt; };
+		uint8_t			getPmtVersion(void)		{ return pmt_version; };
 
 		CZapitAudioChannel * 	getAudioChannel(unsigned char index = 0xFF);
 		unsigned short 		getAudioPid(unsigned char index = 0xFF);
@@ -222,12 +223,13 @@ class CZapitChannel
 		void setPcrPid(unsigned short pPcrPid)			{ pcrPid = pPcrPid; }
 		void setPmtPid(unsigned short pPmtPid)			{ pmtPid = pPmtPid; }
 		void setTeletextPid(unsigned short pTeletextPid)	{ teletextPid = pTeletextPid; }
-		void setTeletextLang(char * lang)			{ ttx_language_code = lang; };
+		void setTeletextLang(std::string lang)			{ ttx_language_code = lang; };
 		void setVideoPid(unsigned short pVideoPid)		{ videoPid = pVideoPid; }
 		void setAudioPid(unsigned short pAudioPid)		{ audioPid = pAudioPid; }
 		void setPrivatePid(unsigned short pPrivatePid)		{ privatePid = pPrivatePid; }
 		void setPidsFlag(void)					{ pidsFlag = true; }
-		void setCaPmt(CCaPmt *pCaPmt);
+		//void setCaPmt(CCaPmt *pCaPmt);
+		void setPmtVersion(uint8_t version)			{ pmt_version = version; }
 		void setRawPmt(unsigned char * pmt, int len = 0);
 		/* cleanup methods */
 		void resetPids(void);
diff --git a/src/zapit/src/channel.cpp b/src/zapit/src/channel.cpp
index 5213104f5..96419c715 100644
--- a/src/zapit/src/channel.cpp
+++ b/src/zapit/src/channel.cpp
@@ -52,7 +52,7 @@ CZapitChannel::CZapitChannel(const std::string & p_name, t_channel_id p_channel_
 
 void CZapitChannel::Init()
 {
-	caPmt = NULL;
+	//caPmt = NULL;
 	rawPmt = NULL;
 	type = 0;
 	number = 0;
@@ -72,7 +72,7 @@ CZapitChannel::~CZapitChannel(void)
 {
 //printf("DEL CHANNEL %s %x subs %d\n", name.c_str(), (int) this, getSubtitleCount());
 	resetPids();
-	setCaPmt(NULL);
+	//setCaPmt(NULL);
 	setRawPmt(NULL);
 	camap.clear();
 }
@@ -280,12 +280,14 @@ int CZapitChannel::getChannelSubIndex(void)
     return currentSub < getSubtitleCount() ? currentSub : -1;
 }
 
+#if 0
 void CZapitChannel::setCaPmt(CCaPmt *pCaPmt)
 { 
 	if(caPmt)
 		delete caPmt;
 	caPmt = pCaPmt; 
 }
+#endif
 
 void CZapitChannel::setRawPmt(unsigned char * pmt, int len)
 {