channel class: Add record demux, polarization, ca sysmap

This commit is contained in:
[CST] Focus
2012-01-13 14:19:56 +04:00
parent c49ccd0b78
commit cac099966b
2 changed files with 14 additions and 0 deletions

View File

@@ -29,6 +29,7 @@
#include <cstdlib> #include <cstdlib>
#include <xmltree/xmlinterface.h> #include <xmltree/xmlinterface.h>
#include <sectionsdclient/sectionsdclient.h> #include <sectionsdclient/sectionsdclient.h>
#include <set>
/* zapit */ /* zapit */
#include "ci.h" #include "ci.h"
@@ -108,6 +109,9 @@ class CZapitAudioChannel
class CChannelList; class CChannelList;
typedef std::set<int> casys_map_t;
typedef casys_map_t::iterator casys_map_iterator_t;
class CZapitChannel class CZapitChannel
{ {
private: private:
@@ -155,9 +159,13 @@ class CZapitChannel
std::string ttx_language_code; std::string ttx_language_code;
uint8_t record_demux;
friend class CChannelList; friend class CChannelList;
public: public:
casys_map_t camap;
bool bAlwaysLocked; bool bAlwaysLocked;
int number; int number;
@@ -167,6 +175,7 @@ class CZapitChannel
unsigned char scrambled; unsigned char scrambled;
char * pname; char * pname;
bool has_bouquet; bool has_bouquet;
uint8_t polarization;
/* constructor, desctructor */ /* constructor, desctructor */
CZapitChannel(const std::string & p_name, t_service_id p_sid, t_transport_stream_id p_tsid, t_original_network_id p_onid, unsigned char p_service_type, t_satellite_position p_satellite_position, freq_id_t freq); CZapitChannel(const std::string & p_name, t_service_id p_sid, t_transport_stream_id p_tsid, t_original_network_id p_onid, unsigned char p_service_type, t_satellite_position p_satellite_position, freq_id_t freq);
@@ -232,6 +241,8 @@ class CZapitChannel
void dumpServiceXml(FILE * fd, const char * action = NULL); void dumpServiceXml(FILE * fd, const char * action = NULL);
void dumpBouquetXml(FILE * fd); void dumpBouquetXml(FILE * fd);
void setRecordDemux(int num) { record_demux = num; };
int getRecordDemux() { return record_demux; };
}; };
#endif /* __zapit_channel_h__ */ #endif /* __zapit_channel_h__ */

View File

@@ -46,6 +46,8 @@ CZapitChannel::CZapitChannel(const std::string & p_name, t_service_id p_sid, t_t
last_unlocked_EPGid = 0; last_unlocked_EPGid = 0;
last_unlocked_time = 0; last_unlocked_time = 0;
has_bouquet = false; has_bouquet = false;
record_demux = 2;
polarization = 0;
//printf("NEW CHANNEL %s %x\n", name.c_str(), (int) this); //printf("NEW CHANNEL %s %x\n", name.c_str(), (int) this);
} }
@@ -55,6 +57,7 @@ CZapitChannel::~CZapitChannel(void)
resetPids(); resetPids();
setCaPmt(NULL); setCaPmt(NULL);
setRawPmt(NULL); setRawPmt(NULL);
camap.clear();
//if(currentEvent) //if(currentEvent)
// delete currentEvent; // delete currentEvent;