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

gui/scan_setup.cpp: get satellite transponders from CServiceManager

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d52724dfc
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:01:45 +04:00
parent a1e05e516c
commit 6b7ffb2219
1 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/gui/scan_setup.cpp
View File

@@ -61,7 +61,7 @@
#include <zapit/debug.h> #include <zapit/debug.h>
#include <set> #include <set>
extern std::map<transponder_id_t, transponder> select_transponders; //extern std::map<transponder_id_t, transponder> select_transponders;
extern Zapit_config zapitCfg; extern Zapit_config zapitCfg;
extern char zapit_lat[20]; extern char zapit_lat[20];
extern char zapit_long[20]; extern char zapit_long[20];
@@ -980,11 +980,8 @@ void CScanSetup::updateManualSettings()
int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/) int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/)
{ {
transponder_list_t::iterator tI;
t_satellite_position position = 0;
std::map<int, transponder> tmplist; std::map<int, transponder> tmplist;
std::map<int, transponder>::iterator tmpI; std::map<int, transponder>::iterator tmpI;
int i;
char cnt[5]; char cnt[5];
int select = -1; int select = -1;
static int old_selected = 0; static int old_selected = 0;
@@ -995,10 +992,9 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/
if (parent) if (parent)
parent->hide(); parent->hide();
position = CServiceManager::getInstance()->GetSatellitePosition(scansettings.satNameNoDiseqc); t_satellite_position position = CServiceManager::getInstance()->GetSatellitePosition(scansettings.satNameNoDiseqc);
if (old_position != position) if (old_position != position) {
{
old_selected = 0; old_selected = 0;
old_position = position; old_position = position;
} }
@@ -1007,18 +1003,15 @@ 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
CZapitChannel * channel = CZapit::getInstance()->GetCurrentChannel();
CFrontend * frontend = CFEManager::getInstance()->getLiveFE(); CFrontend * frontend = CFEManager::getInstance()->getLiveFE();
i = 0; int i = 0;
for (tI = select_transponders.begin(); tI != select_transponders.end(); ++tI) transponder_list_t &select_transponders = CServiceManager::getInstance()->GetSatelliteTransponders(position);
{ for (transponder_list_t::iterator tI = select_transponders.begin(); tI != select_transponders.end(); ++tI) {
if (tI->second.satellitePosition != position)
continue;
char buf[128]; char buf[128];
sprintf(cnt, "%d", i); sprintf(cnt, "%d", i);
char * f, *s, *m; char * f, *s, *m;
switch (frontend->getInfo()->type) switch (frontend->getInfo()->type) {
{
case FE_QPSK: case FE_QPSK:
frontend->getDelSys(tI->second.feparams.u.qpsk.fec_inner, dvbs_get_modulation(tI->second.feparams.u.qpsk.fec_inner), f, s, m); frontend->getDelSys(tI->second.feparams.u.qpsk.fec_inner, dvbs_get_modulation(tI->second.feparams.u.qpsk.fec_inner), f, s, m);
snprintf(buf, sizeof(buf), "%d %c %d %s %s %s ", tI->second.feparams.frequency/1000, tI->second.polarization ? 'V' : 'H', tI->second.feparams.u.qpsk.symbol_rate/1000, f, s, m); snprintf(buf, sizeof(buf), "%d %c %d %s %s %s ", tI->second.feparams.frequency/1000, tI->second.polarization ? 'V' : 'H', tI->second.feparams.u.qpsk.symbol_rate/1000, f, s, m);
@@ -1032,9 +1025,7 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/
break; break;
} }
CZapitChannel * channel = CZapit::getInstance()->GetCurrentChannel(); if(!old_selected && channel && channel->getSatellitePosition() == position) {
if(!old_selected && channel && channel->getSatellitePosition() == position)
{
if(channel->getFreqId() == GET_FREQ_FROM_TPID(tI->first)) if(channel->getFreqId() == GET_FREQ_FROM_TPID(tI->first))
old_selected = i; old_selected = i;
} }
@@ -1048,8 +1039,7 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/
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;
ShowHintUTF(LOCALE_MESSAGEBOX_ERROR, text.c_str(), 450, 2); ShowHintUTF(LOCALE_MESSAGEBOX_ERROR, text.c_str(), 450, 2);
@@ -1061,8 +1051,7 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/
delete selector; delete selector;
if (select >= 0) if (select >= 0) {
{
old_selected = select; old_selected = select;
tmpI = tmplist.find(select); tmpI = tmplist.find(select);
@@ -1072,8 +1061,7 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &/*actionkey*/
sprintf(scansettings.TP_freq, "%d", tmpI->second.feparams.frequency); sprintf(scansettings.TP_freq, "%d", tmpI->second.feparams.frequency);
switch (frontend->getInfo()->type) switch (frontend->getInfo()->type) {
{
case FE_QPSK: case FE_QPSK:
sprintf(scansettings.TP_rate, "%d", tmpI->second.feparams.u.qpsk.symbol_rate); sprintf(scansettings.TP_rate, "%d", tmpI->second.feparams.u.qpsk.symbol_rate);
scansettings.TP_fec = tmpI->second.feparams.u.qpsk.fec_inner; scansettings.TP_fec = tmpI->second.feparams.u.qpsk.fec_inner;