mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 18:01:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit/src/scansdt.cpp: mark current TP channels as removed, mark channels as new

Browse Source
This commit is contained in:
[CST] Focus
2012-04-03 20:42:45 +04:00
parent 42c41a83fc
commit 5023604dbd
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/zapit/src/scansdt.cpp
View File

@@ -155,11 +155,21 @@ bool CSdt::Parse(t_transport_stream_id &tsid, t_original_network_id &onid)
if(!Read()) if(!Read())
return false; return false;
bool updated = false;
for (it = sections.begin(); it != sections.end(); ++it) { for (it = sections.begin(); it != sections.end(); ++it) {
ServiceDescriptionSection * sdt = *it; ServiceDescriptionSection * sdt = *it;
transport_stream_id = sdt->getTransportStreamId(); transport_stream_id = sdt->getTransportStreamId();
original_network_id = sdt->getOriginalNetworkId(); original_network_id = sdt->getOriginalNetworkId();
if(!current && !updated) {
updated = true;
transponder_id_t tpid = CREATE_TRANSPONDER_ID_FROM_SATELLITEPOSITION_ORIGINALNETWORK_TRANSPORTSTREAM_ID(
freq_id, satellitePosition, original_network_id, transport_stream_id);
ZapitChannelList satChannelList;
CServiceManager::getInstance()->GetAllTransponderChannels(satChannelList, tpid);
for (zapit_list_it_t oldI = satChannelList.begin(); oldI != satChannelList.end(); ++oldI)
(*oldI)->flags = CZapitChannel::REMOVED;
}
#ifdef DEBUG_SDT #ifdef DEBUG_SDT
printf("SDT: tid %02x onid %02x\n", sdt->getTransportStreamId(), sdt->getOriginalNetworkId()); printf("SDT: tid %02x onid %02x\n", sdt->getTransportStreamId(), sdt->getOriginalNetworkId());
@@ -306,11 +316,15 @@ bool CSdt::ParseServiceDescriptor(ServiceDescription * service, ServiceDescripto
if (channel) { if (channel) {
channel->setName(serviceName); channel->setName(serviceName);
channel->setServiceType(real_type); channel->setServiceType(real_type);
channel->flags = CZapitChannel::UPDATED;
} else { } else {
channel = new CZapitChannel(serviceName, channel_id, channel = new CZapitChannel(serviceName, channel_id,
real_type, satellitePosition, freq_id); real_type, satellitePosition, freq_id);
CServiceManager::getInstance()->AddChannel(channel); CServiceManager::getInstance()->AddChannel(channel);
/* mark channel as new, if this satellite already have channels */
if (CServiceScan::getInstance()->SatHaveChannels())
channel->flags = CZapitChannel::NEW;
} }
channel->scrambled = free_ca; channel->scrambled = free_ca;