zapit channel: add constructor using channel_id

Origin commit data
------------------
Branch: ni/coolstream
Commit: 1449323394
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-19 (Thu, 19 Jan 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-01-19 15:24:52 +04:00
parent f8304303bc
commit b4544084c9

View File

@@ -161,6 +161,7 @@ class CZapitChannel
uint8_t record_demux; uint8_t record_demux;
void Init();
friend class CChannelList; friend class CChannelList;
public: public:
@@ -179,6 +180,7 @@ class CZapitChannel
/* 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);
CZapitChannel(const std::string & p_name, t_channel_id p_channel_id, unsigned char p_service_type, t_satellite_position p_satellite_position, freq_id_t p_freq);
~CZapitChannel(void); ~CZapitChannel(void);
/* get methods - read only variables */ /* get methods - read only variables */
@@ -243,6 +245,11 @@ class CZapitChannel
void dumpBouquetXml(FILE * fd); void dumpBouquetXml(FILE * fd);
void setRecordDemux(int num) { record_demux = num; }; void setRecordDemux(int num) { record_demux = num; };
int getRecordDemux() { return record_demux; }; int getRecordDemux() { return record_demux; };
static t_channel_id makeChannelId(t_satellite_position sat, freq_id_t freq,
t_transport_stream_id tsid, t_original_network_id onid, t_service_id sid)
{
return (((uint64_t)(sat+freq*4) << 48) | ((uint64_t) tsid << 32) | ((uint64_t)onid << 16) | (uint64_t)sid);
};
}; };
#endif /* __zapit_channel_h__ */ #endif /* __zapit_channel_h__ */