mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 00:11:14 +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
This commit is contained in:
[CST] Focus
2014-05-14 16:32:49 +04:00
parent 8acad336ba
commit 0c22682df3
8 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/driver/scanepg.cpp
View File

@@ -172,14 +172,14 @@ void CEpgScan::AddTransponders()
AddBouquet(bouquetList->Bouquets[current_bnum]->channelList);
INFO("Added bouquet #%d, scan map size: %d", current_bnum, scanmap.size());
}
} else {
} else if (g_settings.epg_scan == SCAN_FAV) {
AddFavorites();
}
}
bool CEpgScan::CheckMode()
{
if (!g_settings.epg_scan
if ((g_settings.epg_scan_mode == CEpgScan::MODE_OFF)
|| (standby && !(g_settings.epg_scan_mode & MODE_STANDBY))
|| (!standby && !(g_settings.epg_scan_mode & MODE_LIVE))
|| (!standby && (CFEManager::getInstance()->getEnabledCount() <= 1))) {
@@ -201,7 +201,7 @@ void CEpgScan::Start(bool instandby)
void CEpgScan::Stop()
{
if (!g_settings.epg_scan)
if (g_settings.epg_scan_mode == CEpgScan::MODE_OFF)
return;
INFO("stopping %s scan...", standby ? "standby" : "live");
@@ -306,12 +306,7 @@ void CEpgScan::Next()
bool locked = false;
next_chid = 0;
#if 0
if (!g_settings.epg_scan)
return;
if (!CheckMode())
return;
#endif
if (!standby && CNeutrinoApp::getInstance()->getMode() == NeutrinoMessages::mode_standby)
return;
if (CRecordManager::getInstance()->RecordingStatus() || CStreamManager::getInstance()->StreamStatus())