mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit/src/scan.cpp: update satellite transponder list after scan

Browse Source
This commit is contained in:
[CST] Focus
2012-04-17 15:06:54 +04:00
parent 4082cf3fe2
commit 42b7cb33ab
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -193,6 +193,7 @@ _repeat:
if(abort_scan) if(abort_scan)
return false; return false;
processed_transponders++;
/* partial compare with already scanned, skip duplicate */ /* partial compare with already scanned, skip duplicate */
for (stiterator ntI = scanedtransponders.begin(); ntI != scanedtransponders.end(); ++ntI) { for (stiterator ntI = scanedtransponders.begin(); ntI != scanedtransponders.end(); ++ntI) {
if (ntI->second == tI->second) { if (ntI->second == tI->second) {
@@ -202,27 +203,27 @@ _repeat:
} }
} }
printf("[scan] scanning: %llx\n", tI->first); transponder t(frontendType, tI->first, tI->second.feparams, tI->second.polarization);
t.dump("[scan] scanning:");
SendTransponderInfo(tI->second); SendTransponderInfo(tI->second);
transponder t(frontendType, tI->first, tI->second.feparams, tI->second.polarization);
if (!tuneFrequency(&(tI->second.feparams), tI->second.polarization, satellitePosition)) { if (!tuneFrequency(&(tI->second.feparams), tI->second.polarization, satellitePosition)) {
failed_transponders++; failed_transponders++;
failedtransponders.insert(transponder_pair_t(t.transponder_id, t)); failedtransponders.insert(transponder_pair_t(t.transponder_id, t));
continue; continue;
} }
tI->second.scanned = true;
scanedtransponders.insert(transponder_pair_t(t.transponder_id, t)); scanedtransponders.insert(transponder_pair_t(t.transponder_id, t));
if(abort_scan) if(abort_scan)
return false; return false;
/* partial compare with existent transponders, update params if found */ /* partial compare with existent transponders, update params if found */
for (transponder_list_t::iterator ttI = transponders.begin(); ttI != transponders.end(); ++ttI) { for (stiterator ttI = transponders.begin(); ttI != transponders.end(); ++ttI) {
if(t == ttI->second) { if(t == ttI->second) {
ttI->second.dump("[scan] similar tp, old"); ttI->second.dump("[scan] similar tp, old");
t.dump("[scan] similar tp, new"); t.dump("[scan] similar tp, new");
ttI->second.feparams = t.feparams; ttI->second.feparams = t.feparams;
ttI->second.polarization = t.polarization; ttI->second.polarization = t.polarization;
break;
} }
} }
@@ -292,6 +293,11 @@ _repeat:
ntI->second.dump("[scan] use tp from nit:"); ntI->second.dump("[scan] use tp from nit:");
scantransponders.insert(transponder_pair_t(ntI->first, ntI->second)); 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(); nittransponders.clear();
printf("\n\n[scan] found %d additional transponders from nit\n", scantransponders.size()); printf("\n\n[scan] found %d additional transponders from nit\n", scantransponders.size());
@@ -377,18 +383,9 @@ bool CServiceScan::ScanProvider(t_satellite_position satellitePosition)
CZapit::getInstance()->SendEvent(CZapitClient::EVT_SCAN_REPORT_NUM_SCANNED_TRANSPONDERS, &processed_transponders, sizeof(processed_transponders)); CZapit::getInstance()->SendEvent(CZapitClient::EVT_SCAN_REPORT_NUM_SCANNED_TRANSPONDERS, &processed_transponders, sizeof(processed_transponders));
CZapit::getInstance()->SendEvent(CZapitClient::EVT_SCAN_SATELLITE, satname.c_str(), satname.size() + 1); CZapit::getInstance()->SendEvent(CZapitClient::EVT_SCAN_SATELLITE, satname.c_str(), satname.size() + 1);
/* transponders from current service list */
for(tI = transponders.begin(); tI != transponders.end(); ++tI) {
if(abort_scan)
return false;
if(tI->second.satellitePosition == satellitePosition)
AddTransponder(tI->first, &tI->second.feparams, tI->second.polarization);
}
/* transponders from satellites.xml */
transponder_list_t &select_transponders = CServiceManager::getInstance()->GetSatelliteTransponders(satellitePosition); transponder_list_t &select_transponders = CServiceManager::getInstance()->GetSatelliteTransponders(satellitePosition);
for (tI = select_transponders.begin(); tI != select_transponders.end(); ++tI) { for (tI = select_transponders.begin(); tI != select_transponders.end(); ++tI) {
if(abort_scan)
return false;
AddTransponder(tI->first, &tI->second.feparams, tI->second.polarization); AddTransponder(tI->first, &tI->second.feparams, tI->second.polarization);
} }
@@ -398,6 +395,7 @@ bool CServiceScan::ScanProvider(t_satellite_position satellitePosition)
* some channels set the service_type in the BAT or the NIT. * some channels set the service_type in the BAT or the NIT.
* should the NIT be parsed on every transponder? */ * should the NIT be parsed on every transponder? */
FixServiceTypes(); FixServiceTypes();
CServiceManager::getInstance()->UpdateSatTransponders(satellitePosition);
TIMER_STOP_SEC("[scan] scanning took"); TIMER_STOP_SEC("[scan] scanning took");
return true; return true;
@@ -550,6 +548,8 @@ bool CServiceScan::ScanTransponder()
/* read network information table */ /* read network information table */
ReadNitSdt(satellitePosition); ReadNitSdt(satellitePosition);
FixServiceTypes();
CServiceManager::getInstance()->UpdateSatTransponders(satellitePosition);
#if 0 #if 0
if (found_channels) if (found_channels)
ReplaceTransponderParams(freq, satellitePosition, &TP->feparams, TP->polarization); ReplaceTransponderParams(freq, satellitePosition, &TP->feparams, TP->polarization);
@@ -599,7 +599,6 @@ void CServiceScan::SendTransponderInfo(transponder &t)
actual_freq /= 1000; actual_freq /= 1000;
CZapit::getInstance()->SendEvent(CZapitClient::EVT_SCAN_REPORT_FREQUENCY, &actual_freq,sizeof(actual_freq)); CZapit::getInstance()->SendEvent(CZapitClient::EVT_SCAN_REPORT_FREQUENCY, &actual_freq,sizeof(actual_freq));
processed_transponders++;
CZapit::getInstance()->SendEvent(CZapitClient::EVT_SCAN_REPORT_NUM_SCANNED_TRANSPONDERS, &processed_transponders, sizeof(processed_transponders)); CZapit::getInstance()->SendEvent(CZapitClient::EVT_SCAN_REPORT_NUM_SCANNED_TRANSPONDERS, &processed_transponders, sizeof(processed_transponders));
CZapit::getInstance()->SendEvent(CZapitClient::EVT_SCAN_PROVIDER, (void *) " ", 2); CZapit::getInstance()->SendEvent(CZapitClient::EVT_SCAN_PROVIDER, (void *) " ", 2);
CZapit::getInstance()->SendEvent(CZapitClient::EVT_SCAN_SERVICENAME, (void *) " ", 2); CZapit::getInstance()->SendEvent(CZapitClient::EVT_SCAN_SERVICENAME, (void *) " ", 2);