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

zapit/src/scan.cpp: create user bouquet from network name, if lcn found;

Browse Source 
split adding nit transponders code to AddFromNit()
This commit is contained in:
[CST] Focus
2012-05-11 13:46:47 +04:00
parent 6420a0cdb5
commit bd58def151
2 changed files with 64 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/zapit/include/zapit/scan.h
View File

@@ -91,6 +91,7 @@ class CServiceScan : public OpenThreads::Thread
bool tuneFrequency(FrontendParameters *feparams, uint8_t polarization, t_satellite_position satellitePosition); bool tuneFrequency(FrontendParameters *feparams, uint8_t polarization, t_satellite_position satellitePosition);
void SendTransponderInfo(transponder &t); void SendTransponderInfo(transponder &t);
bool ReadNitSdt(t_satellite_position satellitePosition); bool ReadNitSdt(t_satellite_position satellitePosition);
bool AddFromNit();
void FixServiceTypes(); void FixServiceTypes();
void CheckSatelliteChannels(t_satellite_position satellitePosition); void CheckSatelliteChannels(t_satellite_position satellitePosition);

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

@@ -176,6 +176,40 @@ bool CServiceScan::AddTransponder(transponder_id_t TsidOnid, FrontendParameters
return true; return true;
} }
bool CServiceScan::AddFromNit()
{
scantransponders.clear();
stiterator tI;
for (stiterator ntI = nittransponders.begin(); ntI != nittransponders.end(); ++ntI) {
/* full compare with failed, ignore same transponders */
for (tI = failedtransponders.begin(); tI != failedtransponders.end(); ++tI) {
if (ntI->second.compare(tI->second))
break;
}
if (tI != failedtransponders.end()) {
ntI->second.dump("[scan] not use tp from nit:");
continue;
}
/* partial compare with scaned, ignore same transponders */
for (tI = scanedtransponders.begin(); tI != scanedtransponders.end(); ++tI) {
if (ntI->second == tI->second)
break;
}
if (tI == scanedtransponders.end()) {
ntI->second.dump("[scan] use tp from nit:");
scantransponders.insert(transponder_pair_t(ntI->first, ntI->second));
}
/* common satellites.xml have V/H, update to L/R if found */
stiterator stI = transponders.find(ntI->first);
if(stI != transponders.end() && stI->second == ntI->second) {
stI->second.polarization = ntI->second.polarization;
}
}
nittransponders.clear();
printf("\n\n[scan] found %d additional transponders from nit\n", scantransponders.size());
return !scantransponders.empty();
}
bool CServiceScan::ReadNitSdt(t_satellite_position satellitePosition) bool CServiceScan::ReadNitSdt(t_satellite_position satellitePosition)
{ {
stiterator tI; stiterator tI;
@@ -184,6 +218,8 @@ bool CServiceScan::ReadNitSdt(t_satellite_position satellitePosition)
bouquet_map_t bouquet_map; bouquet_map_t bouquet_map;
channel_number_map_t logical_map; channel_number_map_t logical_map;
#endif #endif
std::string networkName;
channel_number_map_t nit_logical_map;
_repeat: _repeat:
found_transponders += scantransponders.size(); found_transponders += scantransponders.size();
CZapit::getInstance()->SendEvent ( CZapitClient::EVT_SCAN_NUM_TRANSPONDERS, CZapit::getInstance()->SendEvent ( CZapitClient::EVT_SCAN_NUM_TRANSPONDERS,
@@ -245,8 +281,12 @@ _repeat:
CSdt sdt(satellitePosition, freq); CSdt sdt(satellitePosition, freq);
bool sdt_parsed = sdt.Parse(tI->second.transport_stream_id, tI->second.original_network_id); bool sdt_parsed = sdt.Parse(tI->second.transport_stream_id, tI->second.original_network_id);
if(flags & SCAN_NIT) if(flags & SCAN_NIT) {
nit.Stop(); nit.Stop();
networkName = nit.GetNetworkName();
channel_number_map_t &lcn = nit.getLogicalMap();
nit_logical_map.insert(lcn.begin(), lcn.end());
}
#ifdef USE_BAT #ifdef USE_BAT
if(flags & SCAN_BAT) { if(flags & SCAN_BAT) {
@@ -275,39 +315,31 @@ _repeat:
} }
printf("[scan] tpid ready: %llx\n", TsidOnid); printf("[scan] tpid ready: %llx\n", TsidOnid);
} }
if(flags & SCAN_NIT) { if((flags & SCAN_NIT) && AddFromNit())
printf("[scan] found %d transponders (%d failed) and %d channels\n", found_transponders, failed_transponders, found_channels); goto _repeat;
scantransponders.clear();
for (stiterator ntI = nittransponders.begin(); ntI != nittransponders.end(); ++ntI) { if (flags & (SCAN_NIT/*|SCAN_LOGICAL_NUMBERS*/) && !nit_logical_map.empty()) {
/* full compare with failed, ignore same transponders */ std::string pname = networkName;
for (tI = failedtransponders.begin(); tI != failedtransponders.end(); ++tI) { INFO("network [%s] %d logical channels\n", pname.c_str(), nit_logical_map.size());
if (ntI->second.compare(tI->second)) g_bouquetManager->loadBouquets(true);
break; CZapitBouquet* bouquet;
} int bouquetId = g_bouquetManager->existsUBouquet(pname.c_str());
if (tI != failedtransponders.end()) { if (bouquetId == -1)
ntI->second.dump("[scan] not use tp from nit:"); bouquet = g_bouquetManager->addBouquet(pname, true);
continue; else
} bouquet = g_bouquetManager->Bouquets[bouquetId];
/* partial compare with scaned, ignore same transponders */
for (tI = scanedtransponders.begin(); tI != scanedtransponders.end(); ++tI) { for(channel_number_map_t::iterator cit = nit_logical_map.begin(); cit != nit_logical_map.end(); ++cit) {
if (ntI->second == tI->second) CZapitChannel * channel = CServiceManager::getInstance()->FindChannel48(cit->first);
break; if(channel && !bouquet->getChannelByChannelID(channel->getChannelID())) {
} channel->number = cit->second;
if (tI == scanedtransponders.end()) { bouquet->addService(channel);
ntI->second.dump("[scan] use tp from nit:");
scantransponders.insert(transponder_pair_t(ntI->first, ntI->second));
}
/* common satellites.xml have V/H, update to L/R if found */
stiterator stI = transponders.find(ntI->first);
if(stI != transponders.end() && stI->second == ntI->second) {
stI->second.polarization = ntI->second.polarization;
} }
} }
nittransponders.clear(); bouquet->sortBouquetByNumber();
printf("\n\n[scan] found %d additional transponders from nit\n", scantransponders.size()); g_bouquetManager->saveUBouquets();
if(scantransponders.size())
goto _repeat;
} }
#ifdef USE_BAT #ifdef USE_BAT
if(flags & SCAN_BAT) { if(flags & SCAN_BAT) {
bool have_lcn = false; bool have_lcn = false;