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

zapit/src/scan.cpp: WIP, for testing logical numbers howto from BAT

Browse Source
This commit is contained in:
[CST] Focus
2012-04-02 17:31:15 +04:00
parent b0816af716
commit f9bcd85246
1 changed files with 61 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/zapit/src/scan.cpp
View File

@@ -229,6 +229,10 @@ bool CServiceScan::ReadNitSdt(t_satellite_position satellitePosition)
std::map <transponder_id_t, transponder>::iterator sT; std::map <transponder_id_t, transponder>::iterator sT;
printf("[scan] scanning tp from sat/service\n"); printf("[scan] scanning tp from sat/service\n");
#ifdef USE_BAT
bouquet_map_t bouquet_map;
channel_number_map_t logical_map;
#endif
_repeat: _repeat:
for (tI = scantransponders.begin(); tI != scantransponders.end(); tI++) { for (tI = scantransponders.begin(); tI != scantransponders.end(); tI++) {
if(abort_scan) if(abort_scan)
@@ -284,8 +288,16 @@ _repeat:
nit.Stop(); nit.Stop();
#endif #endif
#ifdef USE_BAT #ifdef USE_BAT
if(flags & SCAN_BAT) if(flags & SCAN_BAT) {
bat.Stop(); bat.Stop();
bouquet_map_t & tmp = bat.getBouquets();
for(bouquet_map_t::iterator it = tmp.begin(); it != tmp.end(); ++it) {
bouquet_map[it->first].insert(it->second.begin(), it->second.end());
printf("########### CServiceScan::ReadNitSdt: bouquet_map [%s] size %d ###########\n", it->first.c_str(), bouquet_map[it->first].size());
}
channel_number_map_t &lcn = bat.getLogicalMap();
logical_map.insert(lcn.begin(), lcn.end());
}
#endif #endif
if(!sdt_parsed) { if(!sdt_parsed) {
printf("[scan] SDT failed !\n"); printf("[scan] SDT failed !\n");
@@ -332,6 +344,49 @@ _repeat:
goto _repeat; goto _repeat;
} }
} }
#ifdef USE_BAT
if(flags & SCAN_BAT) {
bool have_lcn = false;
if((flags & SCAN_LOGICAL_NUMBERS) && !logical_map.empty()) {
CServiceManager::getInstance()->ResetChannelNumbers(true, true);
for(channel_number_map_t::iterator lit = logical_map.begin(); lit != logical_map.end(); ++lit) {
CZapitChannel * channel = CServiceManager::getInstance()->FindChannel48(lit->first);
if(channel) {
channel->number = lit->second;
CServiceManager::getInstance()->UseNumber(channel->number, channel->getServiceType() == ST_DIGITAL_RADIO_SOUND_SERVICE);
have_lcn = true;
}
}
}
#if 1
for(bouquet_map_t::iterator it = bouquet_map.begin(); it != bouquet_map.end(); ++it) {
CZapitBouquet* bouquet;
std::string pname = it->first;
int bouquetId = g_bouquetManager->existsUBouquet(pname.c_str());
printf("########### CServiceScan::ReadNitSdt: bouquet [%s] size %d id %d ###########\n", it->first.c_str(), bouquet_map[it->first].size(), bouquetId);
if (bouquetId == -1)
bouquet = g_bouquetManager->addBouquet(pname, true);
else
bouquet = g_bouquetManager->Bouquets[bouquetId];
for(std::set<t_channel_id>::iterator cit = it->second.begin(); cit != it->second.end(); ++cit) {
CZapitChannel * channel = CServiceManager::getInstance()->FindChannel48(*cit);
//if (channel->getAudioPid() == 0) && (channel->getVideoPid() == 0)
if(channel && !bouquet->getChannelByChannelID(channel->getChannelID())) {
bouquet->addService(channel);
}
#if 0
else
printf("CServiceScan::ReadNitSdt: channel id %016llx not found\n", *cit);
#endif
}
if(have_lcn)
bouquet->sortBouquetByNumber();
#endif
}
}
#endif
return true; return true;
} }
@@ -489,6 +544,11 @@ void CServiceScan::SaveServices()
g_bouquetManager->saveBouquets(); g_bouquetManager->saveBouquets();
g_bouquetManager->loadBouquets(); g_bouquetManager->loadBouquets();
printf("[scan] save bouquets done\n"); printf("[scan] save bouquets done\n");
#endif
#ifdef USE_BAT
if(flags & SCAN_BAT) {
g_bouquetManager->saveUBouquets();
}
#endif #endif
if(flags & SCAN_RESET_NUMBERS) if(flags & SCAN_RESET_NUMBERS)
CServiceManager::getInstance()->ResetChannelNumbers(true, true); CServiceManager::getInstance()->ResetChannelNumbers(true, true);