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

gui/scan_setup.cpp: compare transponder to set selected in transponder list

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: ea4ba454cb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-17 (Tue, 17 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-17 19:54:45 +04:00
parent 24f87cdabc
commit 59f36f7771
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/scan_setup.cpp
View File

@@ -1015,7 +1015,11 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/
CMenuSelectorTarget * selector = new CMenuSelectorTarget(&select); CMenuSelectorTarget * selector = new CMenuSelectorTarget(&select);
menu.addIntroItems(NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, CMenuWidget::BTN_TYPE_CANCEL); //add cancel button, ensures that we have enought space left from item caption menu.addIntroItems(NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, CMenuWidget::BTN_TYPE_CANCEL); //add cancel button, ensures that we have enought space left from item caption
transponder ct;
CZapitChannel * channel = CZapit::getInstance()->GetCurrentChannel(); CZapitChannel * channel = CZapit::getInstance()->GetCurrentChannel();
if(channel)
CServiceManager::getInstance()->GetTransponder(channel->getTransponderId(), ct);
CFrontend * frontend = CFEManager::getInstance()->getLiveFE(); CFrontend * frontend = CFEManager::getInstance()->getLiveFE();
int i = 0; int i = 0;
transponder_list_t &select_transponders = CServiceManager::getInstance()->GetSatelliteTransponders(position); transponder_list_t &select_transponders = CServiceManager::getInstance()->GetSatelliteTransponders(position);
@@ -1023,10 +1027,9 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/
sprintf(cnt, "%d", i); sprintf(cnt, "%d", i);
transponder & t = tI->second; transponder & t = tI->second;
if(!old_selected && channel && channel->getSatellitePosition() == position) { if(!old_selected && ct == t)
if(channel->getFreqId() == GET_FREQ_FROM_TPID(tI->first)) old_selected = i;
old_selected = i;
}
std::string tname = t.description(); std::string tname = t.description();
CMenuForwarderNonLocalized * ts_item = new CMenuForwarderNonLocalized(tname.c_str(), true, NULL, selector, cnt, CRCInput::RC_nokey, NULL)/*, false*/; CMenuForwarderNonLocalized * ts_item = new CMenuForwarderNonLocalized(tname.c_str(), true, NULL, selector, cnt, CRCInput::RC_nokey, NULL)/*, false*/;
@@ -1036,7 +1039,6 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/
tmplist.insert(std::pair <int, transponder>(i, tI->second)); tmplist.insert(std::pair <int, transponder>(i, tI->second));
i++; i++;
} }
if (i == 0) { if (i == 0) {
std::string text = "No transponders found for "; std::string text = "No transponders found for ";
text += scansettings.satNameNoDiseqc; text += scansettings.satNameNoDiseqc;