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

neutrino.cpp: create new/removed channel lists if options set

Browse Source 
Origin commit data
------------------
Commit: e4957ce1e0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-22 (Sun, 22 Apr 2012)
This commit is contained in:
[CST] Focus
2012-04-22 15:20:21 +04:00
parent c6d3742e90
commit a68f704a5e
1 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/neutrino.cpp
View File

@@ -369,6 +369,8 @@ int CNeutrinoApp::loadSetup(const char * fname)
#endif #endif
g_settings.make_hd_list = configfile.getInt32("make_hd_list", 1); g_settings.make_hd_list = configfile.getInt32("make_hd_list", 1);
g_settings.make_new_list = configfile.getInt32("make_new_list", 1);
g_settings.make_removed_list = configfile.getInt32("make_removed_list", 1);
//misc //misc
g_settings.power_standby = configfile.getInt32( "power_standby", 0); g_settings.power_standby = configfile.getInt32( "power_standby", 0);
@@ -813,6 +815,8 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32("ci_clock", g_settings.ci_clock); configfile.setInt32("ci_clock", g_settings.ci_clock);
configfile.setInt32( "make_hd_list", g_settings.make_hd_list); configfile.setInt32( "make_hd_list", g_settings.make_hd_list);
configfile.setInt32( "make_new_list", g_settings.make_new_list);
configfile.setInt32( "make_removed_list", g_settings.make_removed_list);
//led //led
configfile.setInt32( "led_tv_mode", g_settings.led_tv_mode); configfile.setInt32( "led_tv_mode", g_settings.led_tv_mode);
configfile.setInt32( "led_standby_mode", g_settings.led_standby_mode); configfile.setInt32( "led_standby_mode", g_settings.led_standby_mode);
@@ -1278,33 +1282,37 @@ void CNeutrinoApp::channelsInit(bool bOnly)
} }
#if 1 #if 1
/* new channels */ /* new channels */
CServiceManager::getInstance()->GetAllTvChannels(zapitList, CZapitChannel::NEW); if (g_settings.make_new_list) {
if (!zapitList.empty()) { CServiceManager::getInstance()->GetAllTvChannels(zapitList, CZapitChannel::NEW);
CBouquet* newBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_NEW), false, true); if (!zapitList.empty()) {
newBouquet->channelList->SetChannelList(&zapitList); CBouquet* newBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_NEW), false, true);
TVallList->Bouquets.push_back(newBouquet); newBouquet->channelList->SetChannelList(&zapitList);
printf("[neutrino] got %d new TV channels\n", zapitList.size()); fflush(stdout); TVallList->Bouquets.push_back(newBouquet);
printf("[neutrino] got %d new TV channels\n", zapitList.size()); fflush(stdout);
}
CServiceManager::getInstance()->GetAllRadioChannels(zapitList, CZapitChannel::NEW);
if (!zapitList.empty()) {
CBouquet* newBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_NEW), false, true);
newBouquet->channelList->SetChannelList(&zapitList);
RADIOallList->Bouquets.push_back(newBouquet);
printf("[neutrino] got %d new RADIO channels\n", zapitList.size()); fflush(stdout);
}
} }
CServiceManager::getInstance()->GetAllTvChannels(zapitList, CZapitChannel::REMOVED); if (g_settings.make_removed_list) {
if (!zapitList.empty()) { CServiceManager::getInstance()->GetAllTvChannels(zapitList, CZapitChannel::REMOVED);
CBouquet* newBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_REMOVED), false, true); if (!zapitList.empty()) {
newBouquet->channelList->SetChannelList(&zapitList); CBouquet* newBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_REMOVED), false, true);
TVallList->Bouquets.push_back(newBouquet); newBouquet->channelList->SetChannelList(&zapitList);
printf("[neutrino] got %d removed TV channels\n", zapitList.size()); fflush(stdout); TVallList->Bouquets.push_back(newBouquet);
} printf("[neutrino] got %d removed TV channels\n", zapitList.size()); fflush(stdout);
CServiceManager::getInstance()->GetAllRadioChannels(zapitList, CZapitChannel::NEW); }
if (!zapitList.empty()) { CServiceManager::getInstance()->GetAllRadioChannels(zapitList, CZapitChannel::REMOVED);
CBouquet* newBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_NEW), false, true); if (!zapitList.empty()) {
newBouquet->channelList->SetChannelList(&zapitList); CBouquet* newBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_REMOVED), false, true);
RADIOallList->Bouquets.push_back(newBouquet); newBouquet->channelList->SetChannelList(&zapitList);
printf("[neutrino] got %d new RADIO channels\n", zapitList.size()); fflush(stdout); RADIOallList->Bouquets.push_back(newBouquet);
} printf("[neutrino] got %d removed RADIO channels\n", zapitList.size()); fflush(stdout);
CServiceManager::getInstance()->GetAllRadioChannels(zapitList, CZapitChannel::REMOVED); }
if (!zapitList.empty()) {
CBouquet* newBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_REMOVED), false, true);
newBouquet->channelList->SetChannelList(&zapitList);
RADIOallList->Bouquets.push_back(newBouquet);
printf("[neutrino] got %d removed RADIO channels\n", zapitList.size()); fflush(stdout);
} }
#endif #endif
TIMER_STOP("[neutrino] sats took"); TIMER_STOP("[neutrino] sats took");
@@ -2350,7 +2358,7 @@ _repeat:
g_bouquetManager->saveBouquets(); g_bouquetManager->saveBouquets();
g_bouquetManager->saveUBouquets(); g_bouquetManager->saveUBouquets();
g_bouquetManager->renumServices(); g_bouquetManager->renumServices();
channelsInit(true); channelsInit(/*true*/);
t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID(); t_channel_id live_channel_id = CZapit::getInstance()->GetCurrentChannelID();
channelList->adjustToChannelID(live_channel_id);//FIXME what if deleted ? channelList->adjustToChannelID(live_channel_id);//FIXME what if deleted ?
bouquetList->activateBouquet(old_b_id, false); bouquetList->activateBouquet(old_b_id, false);