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

gui/scan_setup.cpp: add explicit option to enable/disable fast-scan update

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: b925988afe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-07 (Mon, 07 Apr 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2014-04-07 15:20:47 +04:00
parent 69934cc8db
commit 431d402526
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/scan_setup.cpp
View File

@@ -332,11 +332,16 @@ int CScanSetup::exec(CMenuTarget* parent, const std::string &actionKey)
//...then start scan //...then start scan
CScanTs scanTs(delsys); CScanTs scanTs(delsys);
scanTs.exec(NULL, scants_key[i]); scanTs.exec(NULL, scants_key[i]);
#if 0
/* FIXME save fst version. other than fast scan will reset it to 0 /* FIXME save fst version. other than fast scan will reset it to 0
to disable fast scan updates */ to disable fast scan updates */
scansettings.fst_version = CServiceScan::getInstance()->GetFstVersion(); scansettings.fst_version = CServiceScan::getInstance()->GetFstVersion();
if (is_wizard && as == "fast") #endif
return menu_return::RETURN_EXIT_ALL; if (as == "fast") {
scansettings.fst_update = 1;
if (is_wizard)
return menu_return::RETURN_EXIT_ALL;
}
return res; return res;
} }
} }
@@ -1285,13 +1290,16 @@ void CScanSetup::addScanMenuFastScan(CMenuWidget *fast_ScanMenu)
fastType->setHint("", LOCALE_MENU_HINT_SCAN_FASTTYPE); fastType->setHint("", LOCALE_MENU_HINT_SCAN_FASTTYPE);
fast_ScanMenu->addItem(fastType); fast_ScanMenu->addItem(fastType);
#endif #endif
CMenuOptionChooser* fastUp = new CMenuOptionChooser(LOCALE_SATSETUP_FASTSCAN_UPDATE, (int *)&scansettings.fst_update, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN, true);
fastUp->setHint("", LOCALE_MENU_HINT_SCAN_FASTUPDATE);
fast_ScanMenu->addItem(fastUp);
fast_ScanMenu->addItem(GenericMenuSeparatorLine); fast_ScanMenu->addItem(GenericMenuSeparatorLine);
#if 0
CMenuForwarder * mf = new CMenuForwarder(LOCALE_SCANTS_STARTNOW, allow_start, NULL, this, "sfast", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); CMenuForwarder * mf = new CMenuForwarder(LOCALE_SATSETUP_FASTSCAN_AUTO_DISEQC, allow_start, NULL, this, "fastdiseqc", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
mf->setHint("", LOCALE_MENU_HINT_SCAN_START); mf->setHint("", LOCALE_MENU_HINT_SCAN_FASTDISEQC);
fast_ScanMenu->addItem(mf); fast_ScanMenu->addItem(mf);
#endif
CMenuForwarder * mf = new CMenuForwarder(LOCALE_SATSETUP_FASTSCAN_AUTO_DISEQC, allow_start, NULL, this, "fastdiseqc", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN); mf = new CMenuForwarder(LOCALE_SCANTS_STARTNOW, allow_start, NULL, this, "sfast", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
mf->setHint("", LOCALE_MENU_HINT_SCAN_START); mf->setHint("", LOCALE_MENU_HINT_SCAN_START);
fast_ScanMenu->addItem(mf); fast_ScanMenu->addItem(mf);
} }

4
src/neutrino.cpp
View File

@@ -3444,7 +3444,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
// Active standby on // Active standby on
powerManager->SetStandby(false, false); powerManager->SetStandby(false, false);
CEpgScan::getInstance()->Start(true); CEpgScan::getInstance()->Start(true);
if (scansettings.fst_version) if (scansettings.fst_update)
fst_timer = g_RCInput->addTimer(30*1000*1000, true); fst_timer = g_RCInput->addTimer(30*1000*1000, true);
} else { } else {
// Active standby off // Active standby off
@@ -4224,7 +4224,7 @@ void CNeutrinoApp::Cleanup()
void CNeutrinoApp::CheckFastScan(bool standby, bool reload) void CNeutrinoApp::CheckFastScan(bool standby, bool reload)
{ {
if (scansettings.fst_version) { if (scansettings.fst_update) {
g_Zapit->getMode(); g_Zapit->getMode();
INFO("fst version %02x (%s)", scansettings.fst_version, standby ? "force" : "check"); INFO("fst version %02x (%s)", scansettings.fst_version, standby ? "force" : "check");
CServiceScan::getInstance()->QuietFastScan(true); CServiceScan::getInstance()->QuietFastScan(true);

2
src/system/settings.cpp
View File

@@ -154,6 +154,7 @@ bool CScanSettings::loadSettings(const char * const fileName)
fast_type = configfile.getInt32("fast_type", 2); fast_type = configfile.getInt32("fast_type", 2);
fast_op = configfile.getInt32("fast_op", 0); fast_op = configfile.getInt32("fast_op", 0);
fst_version = configfile.getInt32("fst_version", 0); fst_version = configfile.getInt32("fst_version", 0);
fst_update = configfile.getInt32("fst_update", 0);
cable_nid = configfile.getInt32("cable_nid", 0); cable_nid = configfile.getInt32("cable_nid", 0);
return ret; return ret;
@@ -174,6 +175,7 @@ bool CScanSettings::saveSettings(const char * const fileName)
configfile.setInt32("fast_type", fast_type); configfile.setInt32("fast_type", fast_type);
configfile.setInt32("fast_op", fast_op); configfile.setInt32("fast_op", fast_op);
configfile.setInt32("fst_version", fst_version); configfile.setInt32("fst_version", fst_version);
configfile.setInt32("fst_update", fst_update);
configfile.setInt32("cable_nid", cable_nid); configfile.setInt32("cable_nid", cable_nid);
configfile.setString("satName", satName); configfile.setString("satName", satName);

1
src/system/settings.h
View File

@@ -783,6 +783,7 @@ class CScanSettings
int fast_type; int fast_type;
int fast_op; int fast_op;
int fst_version; int fst_version;
int fst_update;
int cable_nid; int cable_nid;
std::string satName; std::string satName;