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

channel: remove CCaPmt

Browse Source 
Origin commit data
------------------
Commit: 4e97f0aa1e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-25 (Wed, 25 Jan 2012)
This commit is contained in:
[CST] Focus
2012-01-25 17:49:23 +04:00
parent 238cab84a2
commit e3d8ee0286
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/zapit/include/zapit/channel.h
View File

@@ -32,7 +32,6 @@
#include <set> #include <set>
/* zapit */ /* zapit */
#include "ci.h"
#include "types.h" #include "types.h"
//#include <zapit/audio.h> //#include <zapit/audio.h>
@@ -149,9 +148,10 @@ class CZapitChannel
unsigned char serviceType; unsigned char serviceType;
/* the conditional access program map table of this channel */ /* the conditional access program map table of this channel */
CCaPmt * caPmt; //CCaPmt * caPmt;
unsigned char * rawPmt; unsigned char * rawPmt;
int pmtLen; int pmtLen;
uint8_t pmt_version;
/* from neutrino CChannel class */ /* from neutrino CChannel class */
uint64_t last_unlocked_EPGid; uint64_t last_unlocked_EPGid;
@@ -206,8 +206,9 @@ class CZapitChannel
unsigned short getPrivatePid(void) { return privatePid; } unsigned short getPrivatePid(void) { return privatePid; }
unsigned short getPreAudioPid(void) { return audioPid; } unsigned short getPreAudioPid(void) { return audioPid; }
bool getPidsFlag(void) { return pidsFlag; } bool getPidsFlag(void) { return pidsFlag; }
CCaPmt * getCaPmt(void) { return caPmt; } //CCaPmt * getCaPmt(void) { return caPmt; }
unsigned char * getRawPmt(int &len) { len = pmtLen; return rawPmt; }; unsigned char * getRawPmt(int &len) { len = pmtLen; return rawPmt; };
uint8_t getPmtVersion(void) { return pmt_version; };
CZapitAudioChannel * getAudioChannel(unsigned char index = 0xFF); CZapitAudioChannel * getAudioChannel(unsigned char index = 0xFF);
unsigned short getAudioPid(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 setPcrPid(unsigned short pPcrPid) { pcrPid = pPcrPid; }
void setPmtPid(unsigned short pPmtPid) { pmtPid = pPmtPid; } void setPmtPid(unsigned short pPmtPid) { pmtPid = pPmtPid; }
void setTeletextPid(unsigned short pTeletextPid) { teletextPid = pTeletextPid; } 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 setVideoPid(unsigned short pVideoPid) { videoPid = pVideoPid; }
void setAudioPid(unsigned short pAudioPid) { audioPid = pAudioPid; } void setAudioPid(unsigned short pAudioPid) { audioPid = pAudioPid; }
void setPrivatePid(unsigned short pPrivatePid) { privatePid = pPrivatePid; } void setPrivatePid(unsigned short pPrivatePid) { privatePid = pPrivatePid; }
void setPidsFlag(void) { pidsFlag = true; } 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); void setRawPmt(unsigned char * pmt, int len = 0);
/* cleanup methods */ /* cleanup methods */
void resetPids(void); void resetPids(void);

6
src/zapit/src/channel.cpp
View File

@@ -52,7 +52,7 @@ CZapitChannel::CZapitChannel(const std::string & p_name, t_channel_id p_channel_
void CZapitChannel::Init() void CZapitChannel::Init()
{ {
caPmt = NULL; //caPmt = NULL;
rawPmt = NULL; rawPmt = NULL;
type = 0; type = 0;
number = 0; number = 0;
@@ -72,7 +72,7 @@ CZapitChannel::~CZapitChannel(void)
{ {
//printf("DEL CHANNEL %s %x subs %d\n", name.c_str(), (int) this, getSubtitleCount()); //printf("DEL CHANNEL %s %x subs %d\n", name.c_str(), (int) this, getSubtitleCount());
resetPids(); resetPids();
setCaPmt(NULL); //setCaPmt(NULL);
setRawPmt(NULL); setRawPmt(NULL);
camap.clear(); camap.clear();
} }
@@ -280,12 +280,14 @@ int CZapitChannel::getChannelSubIndex(void)
return currentSub < getSubtitleCount() ? currentSub : -1; return currentSub < getSubtitleCount() ? currentSub : -1;
} }
#if 0
void CZapitChannel::setCaPmt(CCaPmt *pCaPmt) void CZapitChannel::setCaPmt(CCaPmt *pCaPmt)
{ {
if(caPmt) if(caPmt)
delete caPmt; delete caPmt;
caPmt = pCaPmt; caPmt = pCaPmt;
} }
#endif
void CZapitChannel::setRawPmt(unsigned char * pmt, int len) void CZapitChannel::setRawPmt(unsigned char * pmt, int len)
{ {