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: do not auto-enable auto-fastscan update after fast scan,

Browse Source 
do not auto-enable persistent channels numbers if scan logical channel numbers enabled,
show start fastscan in easy menu mode, too


Origin commit data
------------------
Commit: 978d2d3ef5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-08-26 (Wed, 26 Aug 2015)
This commit is contained in:
[CST] Focus
2015-08-26 14:27:20 +03:00
parent 87c2b3ed74
commit 0ae38ebdcb
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/scan_setup.cpp
View File

@@ -416,7 +416,7 @@ int CScanSetup::exec(CMenuTarget* parent, const std::string &actionKey)
scansettings.scan_nit_manual = 1; scansettings.scan_nit_manual = 1;
scansettings.scan_fta_flag = 0; scansettings.scan_fta_flag = 0;
if (scansettings.scan_logical_numbers) { if (scansettings.scan_logical_numbers) {
g_settings.keep_channel_numbers = 1; //g_settings.keep_channel_numbers = 1;
CServiceManager::getInstance()->KeepNumbers(g_settings.keep_channel_numbers); CServiceManager::getInstance()->KeepNumbers(g_settings.keep_channel_numbers);
} }
CScanTs scanTs(ALL_CABLE); CScanTs scanTs(ALL_CABLE);
@@ -460,7 +460,7 @@ int CScanSetup::exec(CMenuTarget* parent, const std::string &actionKey)
scansettings.fst_version = CServiceScan::getInstance()->GetFstVersion(); scansettings.fst_version = CServiceScan::getInstance()->GetFstVersion();
#endif #endif
if (as == "fast") { if (as == "fast") {
scansettings.fst_update = 1; //scansettings.fst_update = 1;
if (is_wizard) if (is_wizard)
return menu_return::RETURN_EXIT_ALL; return menu_return::RETURN_EXIT_ALL;
} }
@@ -1478,7 +1478,8 @@ void CScanSetup::addScanMenuFastScan(CMenuWidget *fast_ScanMenu)
mf->setHint("", LOCALE_MENU_HINT_SCAN_FASTDISEQC); mf->setHint("", LOCALE_MENU_HINT_SCAN_FASTDISEQC);
fast_ScanMenu->addItem(mf); fast_ScanMenu->addItem(mf);
if (!g_settings.easymenu) { if (1 /* !g_settings.easymenu */)
{
mf = new CMenuForwarder(LOCALE_SCANTS_STARTNOW, allow_start, NULL, this, "sfast", CRCInput::RC_blue); mf = new CMenuForwarder(LOCALE_SCANTS_STARTNOW, allow_start, NULL, this, "sfast", CRCInput::RC_blue);
mf->setHint("", LOCALE_MENU_HINT_SCAN_START); mf->setHint("", LOCALE_MENU_HINT_SCAN_START);
fast_ScanMenu->addItem(mf); fast_ScanMenu->addItem(mf);
@@ -1607,7 +1608,7 @@ void CScanSetup::addScanMenuCable(CMenuWidget *menu)
menu->addItem(Rate); menu->addItem(Rate);
menu->addItem(mod); menu->addItem(mod);
CMenuOptionChooser *lcn = new CMenuOptionChooser(LOCALE_SATSETUP_LOGICAL_NUMBERS, (int *)&scansettings.scan_logical_numbers, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this, CRCInput::convertDigitToKey(shortCut++)); CMenuOptionChooser *lcn = new CMenuOptionChooser(LOCALE_SATSETUP_LOGICAL_NUMBERS, (int *)&scansettings.scan_logical_numbers, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_settings.keep_channel_numbers, this, CRCInput::convertDigitToKey(shortCut++));
lcn->setHint("", LOCALE_MENU_HINT_SCAN_LOGICAL); lcn->setHint("", LOCALE_MENU_HINT_SCAN_LOGICAL);
menu->addItem(lcn); menu->addItem(lcn);