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

remove deprecated FEC_S2_XXX;

Browse Source 
zapit/src/transponder.cpp: fix missed modulation/delsys in compare(), in dump, show real delsys values;
zapit/src/getservices.cpp: fix satellite frequency, remove deprecated fec convert;
gui/scan_setup.cpp: fix missed modulation/delsys params update;
gui/scan.cpp: add missed modulation scan parameter


Origin commit data
------------------
Commit: 3ab885699c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)
This commit is contained in:
[CST] Focus
2014-08-08 13:45:01 +04:00
parent 307a1bab7f
commit e3c53b6458
8 changed files with 77 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/scan_setup.cpp
View File

@@ -1875,6 +1875,7 @@ void CScanSetup::updateManualSettings()
scansettings.sat_TP_fec = tI->second.feparams.fec_inner;
scansettings.sat_TP_pol = tI->second.feparams.polarization;
scansettings.sat_TP_delsys = tI->second.feparams.delsys;
scansettings.sat_TP_mod = tI->second.feparams.modulation;
scansettings.satName = CServiceManager::getInstance()->GetSatelliteName(channel->getSatellitePosition());
} else if (CFrontend::isCable(tI->second.feparams.delsys)) {
scansettings.cable_TP_freq = to_string(tI->second.feparams.frequency);
@@ -1974,33 +1975,22 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &actionkey)
tmpI = tmplist.find(select);
tmpI->second.dump("CTPSelectHandler::exec: selected TP:");
if (CFrontend::isSat(tmpI->second.feparams.delsys)) {
printf("CTPSelectHandler::exec: selected TP: freq %d pol %d SR %d\n",
tmpI->second.feparams.frequency,
tmpI->second.feparams.polarization,
tmpI->second.feparams.symbol_rate);
scansettings.sat_TP_freq = to_string(tmpI->second.feparams.frequency);
scansettings.sat_TP_rate = to_string(tmpI->second.feparams.symbol_rate);
scansettings.sat_TP_fec = tmpI->second.feparams.fec_inner;
scansettings.sat_TP_pol = tmpI->second.feparams.polarization;
scansettings.sat_TP_delsys = tmpI->second.feparams.delsys;
scansettings.sat_TP_mod = tmpI->second.feparams.modulation;
}
else if (CFrontend::isCable(tmpI->second.feparams.delsys)) {
printf("CTPSelectHandler::exec: selected TP: freq %d SR %d FEC %d\n",
tmpI->second.feparams.frequency,
tmpI->second.feparams.symbol_rate,
tmpI->second.feparams.fec_inner);
scansettings.cable_TP_freq = to_string(tmpI->second.feparams.frequency);
scansettings.cable_TP_rate = to_string(tmpI->second.feparams.symbol_rate);
scansettings.cable_TP_fec = tmpI->second.feparams.fec_inner;
scansettings.cable_TP_mod = tmpI->second.feparams.modulation;
}
else if (CFrontend::isTerr(tmpI->second.feparams.delsys)) {
printf("CTPSelectHandler::exec: selected TP: freq %d BW %d CON %d\n",
tmpI->second.feparams.frequency,
tmpI->second.feparams.bandwidth,
tmpI->second.feparams.modulation);
scansettings.terrestrial_TP_freq = to_string(tmpI->second.feparams.frequency);
scansettings.terrestrial_TP_bw = tmpI->second.feparams.bandwidth;
scansettings.terrestrial_TP_constel = tmpI->second.feparams.modulation;
@@ -2010,9 +2000,7 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &actionkey)
scansettings.terrestrial_TP_coderate_HP = tmpI->second.feparams.code_rate_HP;
scansettings.terrestrial_TP_coderate_LP = tmpI->second.feparams.code_rate_LP;
//scansettings.terrestrialName = CServiceManager::getInstance()->GetSatelliteName(channel->getSatellitePosition());
}
}
if (retval == menu_return::RETURN_EXIT_ALL)