From f0b7161769e44928fc36eabf7e1ec2c548fbd183 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Wed, 12 Jun 2013 18:32:19 +0400 Subject: [PATCH] gui/miscsettings_menu.cpp: add option to enable/disable epg scan Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/680f684ce44104b21c26cd87669f39f66cd3a5ad Author: [CST] Focus Date: 2013-06-12 (Wed, 12 Jun 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/miscsettings_menu.cpp | 6 +++++- src/system/settings.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index 38f2d1e53..c4d30ca26 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -346,6 +346,10 @@ void CMiscMenue::showMiscSettingsMenuEpg(CMenuWidget *ms_epg) CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SAVE, &g_settings.epg_save, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true,miscEpgNotifier); mc->setHint("", LOCALE_MENU_HINT_EPG_SAVE); + CMenuOptionChooser * mc2 = new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SCAN, &g_settings.epg_scan, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, + CFEManager::getInstance()->getEnabledCount() > 1); + mc1->setHint("", LOCALE_MENU_HINT_EPG_SCAN); + ms_epg->addItem(mc); ms_epg->addItem(mc1); ms_epg->addItem(mf); @@ -353,7 +357,7 @@ void CMiscMenue::showMiscSettingsMenuEpg(CMenuWidget *ms_epg) ms_epg->addItem(mf2); ms_epg->addItem(mf3); ms_epg->addItem(mf4); - + ms_epg->addItem(mc2); } //filebrowser settings diff --git a/src/system/settings.h b/src/system/settings.h index b87a35cfd..3810e39ef 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -142,6 +142,7 @@ struct SNeutrinoSettings std::string epg_max_events; std::string epg_extendedcache; std::string epg_dir; + int epg_scan; //network std::string network_ntpserver;