mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

replace GET_SATELLITEPOSITION_FROM_TRANSPONDER_ID with cached satellitePosition

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: b69cb1019c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-10 (Tue, 10 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-10 18:14:26 +04:00
parent 04e19e92a4
commit 74c7d1931a
4 changed files with 15 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/scan.cpp
View File

@@ -95,11 +95,8 @@ void CScanTs::prev_next_TP( bool up)
bool next_tp = false;
if(up) {
for (tI = select_transponders.begin(); tI != select_transponders.end(); tI++) {
t_satellite_position satpos = GET_SATELLITEPOSITION_FROM_TRANSPONDER_ID(tI->first) & 0xFFF;
if (GET_SATELLITEPOSITION_FROM_TRANSPONDER_ID(tI->first) & 0xF000)
satpos = -satpos;
if (satpos != position)
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;
@@ -107,11 +104,8 @@ void CScanTs::prev_next_TP( bool up)
}
}
} else {
for ( tI=select_transponders.end() ; tI != select_transponders.begin(); tI-- ) {
t_satellite_position satpos = GET_SATELLITEPOSITION_FROM_TRANSPONDER_ID(tI->first) & 0xFFF;
if (GET_SATELLITEPOSITION_FROM_TRANSPONDER_ID(tI->first) & 0xF000)
satpos = -satpos;
if (satpos != position)
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;
@@ -248,7 +242,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
satList.push_back(sat);
} else {
satellite_map_t & satmap = CServiceManager::getInstance()->SatelliteList();
for(sit = satmap.begin(); sit != satmap.end(); sit++) {
for(sit = satmap.begin(); sit != satmap.end(); ++sit) {
if(sit->second.use_in_scan) {
sat.position = sit->first;
strncpy(sat.satName, sit->second.name.c_str(), 50);
@@ -301,11 +295,11 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
do {
g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd);
if (test && (msg == CRCInput::RC_down)) {
if (test && (msg == CRCInput::RC_down || msg == CRCInput::RC_left)) {
prev_next_TP(false);
continue;
}
else if (test && (msg == CRCInput::RC_up)) {
else if (test && (msg == CRCInput::RC_up || msg == CRCInput::RC_right)) {
prev_next_TP(true);
continue;
}