gui/scan.cpp: get satellite transponders from CServiceManager

Origin commit data
------------------
Branch: ni/coolstream
Commit: 888be3de95
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-13 (Fri, 13 Apr 2012)


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

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-04-13 18:00:52 +04:00
parent 2b4520157a
commit a1e05e516c

View File

@@ -90,14 +90,13 @@ void CScanTs::prev_next_TP( bool up)
position = CServiceManager::getInstance()->GetSatellitePosition(scansettings.satNameNoDiseqc);
extern std::map<transponder_id_t, transponder> select_transponders;
transponder_list_t &select_transponders = CServiceManager::getInstance()->GetSatelliteTransponders(position);
transponder_list_t::iterator tI;
bool next_tp = false;
/* FIXME transponders with duplicate frequency skipped */
if(up) {
for (tI = select_transponders.begin(); tI != select_transponders.end(); ++tI) {
if (tI->second.satellitePosition != position)
continue;
if(tI->second.feparams.frequency > TP.feparams.frequency){
next_tp = true;
break;
@@ -105,8 +104,6 @@ void CScanTs::prev_next_TP( bool up)
}
} else {
for ( tI=select_transponders.end() ; tI != select_transponders.begin(); --tI ) {
if (tI->second.satellitePosition != position)
continue;
if(tI->second.feparams.frequency < TP.feparams.frequency) {
next_tp = true;
break;