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

gui/miscsettings_menu.cpp: move epg scan OFF option to epg mode,

Browse Source 
reorder epg settings, add separators


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0c22682df3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-05-14 (Wed, 14 May 2014)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2014-05-14 16:32:49 +04:00
parent 0b2a9b580f
commit 92a6be85f7
8 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/neutrino.cpp
View File

@@ -469,8 +469,13 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.epg_save = configfile.getBool("epg_save", false);
g_settings.epg_save_standby = configfile.getBool("epg_save_standby", true);
g_settings.epg_scan = configfile.getInt32("epg_scan", 0);
g_settings.epg_scan_mode = configfile.getInt32("epg_scan_mode", CEpgScan::MODE_ALWAYS);
g_settings.epg_scan = configfile.getInt32("epg_scan", CEpgScan::SCAN_CURRENT);
g_settings.epg_scan_mode = configfile.getInt32("epg_scan_mode", CEpgScan::MODE_OFF);
// backward-compatible check
if (g_settings.epg_scan == 0) {
g_settings.epg_scan = CEpgScan::SCAN_CURRENT;
g_settings.epg_scan_mode = CEpgScan::MODE_OFF;
}
//widget settings
g_settings.widget_fade = false;
g_settings.widget_fade = configfile.getBool("widget_fade" , false );
@@ -2141,7 +2146,7 @@ void CNeutrinoApp::RealRun(CMenuWidget &mainMenu)
StartSubtitles();
saveSetup(NEUTRINO_SETTINGS_FILE);
if (old_epg != g_settings.epg_scan || old_mode != g_settings.epg_scan_mode) {
if (g_settings.epg_scan)
if (g_settings.epg_scan_mode != CEpgScan::MODE_OFF)
CEpgScan::getInstance()->Start();
else
CEpgScan::getInstance()->Clear();
@@ -3400,7 +3405,8 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby )
g_Zapit->stopPip();
#endif
bool stream_status = CStreamManager::getInstance()->StreamStatus();
if(!g_settings.epg_scan && !fromDeepStandby && !CRecordManager::getInstance()->RecordingStatus() && !stream_status) {
if((g_settings.epg_scan_mode == CEpgScan::MODE_OFF) && !fromDeepStandby &&
!CRecordManager::getInstance()->RecordingStatus() && !stream_status) {
g_Zapit->setStandby(true);
} else {
//g_Zapit->stopPlayBack();
@@ -3753,7 +3759,7 @@ void stop_daemons(bool stopall, bool for_flash)
CVFD::getInstance()->Clear();
CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
CVFD::getInstance()->ShowText("Stop daemons...");
g_settings.epg_scan = false;
g_settings.epg_scan_mode = CEpgScan::MODE_OFF;
my_system(NEUTRINO_ENTER_FLASH_SCRIPT);
}