mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 17:01:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino.cpp: add setting to select box state for epg scan

Browse Source
This commit is contained in:
[CST] Focus
2014-03-27 18:47:50 +04:00
parent 29bec8dda2
commit d4353a0692
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/neutrino.cpp
View File

@@ -468,6 +468,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.epg_save = configfile.getBool("epg_save", false); g_settings.epg_save = configfile.getBool("epg_save", false);
g_settings.epg_save_standby = configfile.getBool("epg_save_standby", true); g_settings.epg_save_standby = configfile.getBool("epg_save_standby", true);
g_settings.epg_scan = configfile.getInt32("epg_scan", 0); g_settings.epg_scan = configfile.getInt32("epg_scan", 0);
g_settings.epg_scan_mode = configfile.getInt32("epg_scan_mode", CEpgScan::MODE_ALWAYS);
//widget settings //widget settings
g_settings.widget_fade = false; g_settings.widget_fade = false;
g_settings.widget_fade = configfile.getBool("widget_fade" , false ); g_settings.widget_fade = configfile.getBool("widget_fade" , false );
@@ -974,6 +975,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setBool("epg_save", g_settings.epg_save); configfile.setBool("epg_save", g_settings.epg_save);
configfile.setBool("epg_save_standby", g_settings.epg_save_standby); configfile.setBool("epg_save_standby", g_settings.epg_save_standby);
configfile.setInt32("epg_scan", g_settings.epg_scan); configfile.setInt32("epg_scan", g_settings.epg_scan);
configfile.setInt32("epg_scan_mode", g_settings.epg_scan_mode);
configfile.setInt32("epg_cache_time" ,g_settings.epg_cache ); configfile.setInt32("epg_cache_time" ,g_settings.epg_cache );
configfile.setInt32("epg_extendedcache_time" ,g_settings.epg_extendedcache); configfile.setInt32("epg_extendedcache_time" ,g_settings.epg_extendedcache);
configfile.setInt32("epg_old_events" ,g_settings.epg_old_events ); configfile.setInt32("epg_old_events" ,g_settings.epg_old_events );
@@ -2139,11 +2141,12 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
InfoClock->enableInfoClock(false); InfoClock->enableInfoClock(false);
int old_ttx = g_settings.cacheTXT; int old_ttx = g_settings.cacheTXT;
int old_epg = g_settings.epg_scan; int old_epg = g_settings.epg_scan;
int old_mode = g_settings.epg_scan_mode;
mainMenu.exec(NULL, ""); mainMenu.exec(NULL, "");
InfoClock->enableInfoClock(true); InfoClock->enableInfoClock(true);
StartSubtitles(); StartSubtitles();
saveSetup(NEUTRINO_SETTINGS_FILE); saveSetup(NEUTRINO_SETTINGS_FILE);
if (old_epg != g_settings.epg_scan) { if (old_epg != g_settings.epg_scan || old_mode != g_settings.epg_scan_mode) {
if (g_settings.epg_scan) if (g_settings.epg_scan)
CEpgScan::getInstance()->Start(); CEpgScan::getInstance()->Start();
else else
@@ -3751,7 +3754,9 @@ void stop_daemons(bool stopall, bool for_flash)
pthread_join(nhttpd_thread, NULL); pthread_join(nhttpd_thread, NULL);
} }
printf("httpd shutdown done\n"); printf("httpd shutdown done\n");
printf("streaming shutdown\n");
CStreamManager::getInstance()->Stop(); CStreamManager::getInstance()->Stop();
printf("streaming shutdown done\n");
if(stopall || for_flash) { if(stopall || for_flash) {
printf("timerd shutdown\n"); printf("timerd shutdown\n");
if (g_Timerd) if (g_Timerd)

1
src/system/settings.h
View File

@@ -151,6 +151,7 @@ struct SNeutrinoSettings
int epg_extendedcache; int epg_extendedcache;
std::string epg_dir; std::string epg_dir;
int epg_scan; int epg_scan;
int epg_scan_mode;
int epg_search_history_size; int epg_search_history_size;
int epg_search_history_max; int epg_search_history_max;