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

zapit/src/channel.cpp: add epg_id to use in place of channel id if needed

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: dc506ab335
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-02 (Tue, 02 Jun 2015)


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

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2015-06-02 15:15:41 +03:00
parent 3b141a5863
commit bad5e20ef8
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,6 +122,7 @@ class CZapitChannel
std::string name; std::string name;
/* TODO : Enable different unames in different bouquets ( generated bouquetID ? ) */ /* TODO : Enable different unames in different bouquets ( generated bouquetID ? ) */
std::string uname; std::string uname;
t_channel_id epg_id;
/* WebTV */ /* WebTV */
std::string url; std::string url;
@@ -205,7 +206,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(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(const char *p_name, t_channel_id p_channel_id, const char *p_url, const char *p_desc); CZapitChannel(const char *p_name, t_channel_id p_channel_id, const char *p_url, const char *p_desc, t_channel_id epgid = 0);
~CZapitChannel(void); ~CZapitChannel(void);
/* get methods - read only variables */ /* get methods - read only variables */
@@ -284,6 +285,7 @@ class CZapitChannel
return (((uint64_t)(sat+freq*4) << 48) | ((uint64_t) tsid << 32) | ((uint64_t)onid << 16) | (uint64_t)sid); return (((uint64_t)(sat+freq*4) << 48) | ((uint64_t) tsid << 32) | ((uint64_t)onid << 16) | (uint64_t)sid);
}; };
bool Locked() { return (bLocked || !!bLockCount); } bool Locked() { return (bLocked || !!bLockCount); }
t_channel_id getEpgID(void) const { return epg_id; }
}; };
struct CmpChannelBySat: public std::binary_function <const CZapitChannel * const, const CZapitChannel * const, bool> struct CmpChannelBySat: public std::binary_function <const CZapitChannel * const, const CZapitChannel * const, bool>

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

@@ -37,6 +37,7 @@ CZapitChannel::CZapitChannel(const std::string & p_name, t_service_id p_sid, t_t
satellitePosition = p_satellite_position; satellitePosition = p_satellite_position;
freq = p_freq; freq = p_freq;
channel_id = CREATE_CHANNEL_ID64; channel_id = CREATE_CHANNEL_ID64;
epg_id = channel_id;
Init(); Init();
//printf("NEW CHANNEL %s %x\n", name.c_str(), (int) this); //printf("NEW CHANNEL %s %x\n", name.c_str(), (int) this);
} }
@@ -51,11 +52,12 @@ CZapitChannel::CZapitChannel(const std::string & p_name, t_channel_id p_channel_
serviceType = p_service_type; serviceType = p_service_type;
satellitePosition = p_satellite_position; satellitePosition = p_satellite_position;
freq = p_freq; freq = p_freq;
epg_id = channel_id;
Init(); Init();
} }
// For WebTV ... // For WebTV ...
CZapitChannel::CZapitChannel(const char *p_name, t_channel_id p_channel_id, const char *p_url, const char *p_desc) CZapitChannel::CZapitChannel(const char *p_name, t_channel_id p_channel_id, const char *p_url, const char *p_desc, t_channel_id epgid)
{ {
if (!p_name || !p_url) if (!p_name || !p_url)
return; return;
@@ -70,6 +72,7 @@ CZapitChannel::CZapitChannel(const char *p_name, t_channel_id p_channel_id, cons
serviceType = ST_DIGITAL_TELEVISION_SERVICE; serviceType = ST_DIGITAL_TELEVISION_SERVICE;
satellitePosition = 0; satellitePosition = 0;
freq = 0; freq = 0;
epg_id = epgid;
Init(); Init();
} }