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

gui/scan_setup.cpp: add pilot param to manual scan menu

Browse Source 
Origin commit data
------------------
Commit: 34691a1724
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-12-08 (Mon, 08 Dec 2014)
This commit is contained in:
[CST] Focus
2014-12-08 17:22:41 +03:00
parent c9d123adde
commit baeb8dc565
10 changed files with 58 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/scan_setup.cpp
View File

@@ -266,6 +266,15 @@ const CMenuOptionChooser::keyval SATSETUP_SCANTP_POL[SATSETUP_SCANTP_POL_COUNT]
{ 3, LOCALE_EXTRA_TP_POL_R }
};
#define SATSETUP_SCANTP_PILOT_COUNT 4
const CMenuOptionChooser::keyval SATSETUP_SCANTP_PILOT[SATSETUP_SCANTP_PILOT_COUNT] =
{
{ ZPILOT_ON, LOCALE_OPTIONS_ON },
{ ZPILOT_OFF, LOCALE_OPTIONS_OFF },
{ ZPILOT_AUTO, LOCALE_EXTRA_TP_PILOT_AUTO },
{ ZPILOT_AUTO_SW, LOCALE_EXTRA_TP_PILOT_AUTO_SW }
};
#define OPTIONS_SOUTH0_NORTH1_OPTION_COUNT 2
const CMenuOptionChooser::keyval OPTIONS_SOUTH0_NORTH1_OPTIONS[OPTIONS_SOUTH0_NORTH1_OPTION_COUNT] =
{
@@ -1635,6 +1644,7 @@ int CScanSetup::addScanOptionsItems(CMenuWidget *options_menu, const int &shortc
CMenuOptionChooser *tm = NULL;
CMenuForwarder *Freq = NULL;
CMenuForwarder *Rate = NULL;
CMenuOptionChooser *pilot = NULL;
if (r_system == ALL_SAT) {
delsys = new CMenuOptionChooser(LOCALE_EXTRA_TP_DELSYS, (int *)&scansettings.sat_TP_delsys, SATSETUP_SCANTP_DELSYS, SATSETUP_SCANTP_DELSYS_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++), "", true);
delsys->setHint("", LOCALE_MENU_HINT_SCAN_DELSYS);
@@ -1650,6 +1660,8 @@ int CScanSetup::addScanOptionsItems(CMenuWidget *options_menu, const int &shortc
fec->setHint("", LOCALE_MENU_HINT_SCAN_FEC);
pol = new CMenuOptionChooser(LOCALE_EXTRA_TP_POL, (int *)&scansettings.sat_TP_pol, SATSETUP_SCANTP_POL, SATSETUP_SCANTP_POL_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++));
pol->setHint("", LOCALE_MENU_HINT_SCAN_POL);
pilot = new CMenuOptionChooser(LOCALE_EXTRA_TP_PILOT, (int *)&scansettings.sat_TP_pilot, SATSETUP_SCANTP_PILOT, SATSETUP_SCANTP_PILOT_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++));
pilot->setHint("", LOCALE_MENU_HINT_SCAN_PILOT);
} else if (r_system == ALL_CABLE) {
delsys = new CMenuOptionChooser(LOCALE_EXTRA_TP_DELSYS, (int *)&scansettings.cable_TP_delsys, CABLESETUP_SCANTP_DELSYS, CABLESETUP_SCANTP_DELSYS_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++), "", true);
delsys->setHint("", LOCALE_MENU_HINT_SCAN_DELSYS);
@@ -1708,6 +1720,8 @@ int CScanSetup::addScanOptionsItems(CMenuWidget *options_menu, const int &shortc
options_menu->addItem(tm);
if (pol)
options_menu->addItem(pol);
if (pilot)
options_menu->addItem(pilot);
return shortCut;
}
@@ -1998,6 +2012,7 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &actionkey)
scansettings.sat_TP_pol = tmpI->second.feparams.polarization;
scansettings.sat_TP_delsys = tmpI->second.feparams.delsys;
scansettings.sat_TP_mod = tmpI->second.feparams.modulation;
scansettings.sat_TP_pilot = tmpI->second.feparams.pilot;
}
else if (CFrontend::isCable(tmpI->second.feparams.delsys)) {
scansettings.cable_TP_freq = to_string(tmpI->second.feparams.frequency);