From 888be3de9568d6203089c60326cf8422c89befb5 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Fri, 13 Apr 2012 18:00:52 +0400
Subject: [PATCH] gui/scan.cpp: get satellite transponders from CServiceManager

---
 src/gui/scan.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/gui/scan.cpp b/src/gui/scan.cpp
index ee606c401..ccc064f4c 100644
--- a/src/gui/scan.cpp
+++ b/src/gui/scan.cpp
@@ -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;