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

neutrino.cpp: move webtv 'provider' to the end of list

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9a09a79de6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-27 (Mon, 27 Oct 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2014-10-27 13:54:02 +03:00
parent 07d6899667
commit e28bb1280d
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/neutrino.cpp
View File

@@ -415,6 +415,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.make_new_list = configfile.getInt32("make_new_list", 1); g_settings.make_new_list = configfile.getInt32("make_new_list", 1);
g_settings.make_removed_list = configfile.getInt32("make_removed_list", 1); g_settings.make_removed_list = configfile.getInt32("make_removed_list", 1);
g_settings.keep_channel_numbers = configfile.getInt32("keep_channel_numbers", 0); g_settings.keep_channel_numbers = configfile.getInt32("keep_channel_numbers", 0);
g_settings.show_empty_favorites = configfile.getInt32("show_empty_favorites", 0);
//misc //misc
g_settings.power_standby = configfile.getInt32( "power_standby", 0); g_settings.power_standby = configfile.getInt32( "power_standby", 0);
@@ -942,6 +943,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32( "make_new_list", g_settings.make_new_list); configfile.setInt32( "make_new_list", g_settings.make_new_list);
configfile.setInt32( "make_removed_list", g_settings.make_removed_list); configfile.setInt32( "make_removed_list", g_settings.make_removed_list);
configfile.setInt32( "keep_channel_numbers", g_settings.keep_channel_numbers); configfile.setInt32( "keep_channel_numbers", g_settings.keep_channel_numbers);
configfile.setInt32( "show_empty_favorites", g_settings.show_empty_favorites);
//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);
@@ -1334,7 +1336,7 @@ void CNeutrinoApp::channelsInit(bool bOnly)
int tvi = 0, ri = 0; int tvi = 0, ri = 0;
ZapitChannelList zapitList; ZapitChannelList zapitList, webtvList;
/* all TV channels */ /* all TV channels */
CServiceManager::getInstance()->GetAllTvChannels(zapitList); CServiceManager::getInstance()->GetAllTvChannels(zapitList);
@@ -1402,20 +1404,16 @@ void CNeutrinoApp::channelsInit(bool bOnly)
} }
/* all WebTV channels */ /* all WebTV channels */
if (g_settings.make_webtv_list) { if (g_settings.make_webtv_list) {
if (CServiceManager::getInstance()->GetAllWebTVChannels(zapitList)) { if (CServiceManager::getInstance()->GetAllWebTVChannels(webtvList)) {
/* all channels */ /* all channels */
CBouquet* webtvBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_WEBTV), false, true); CBouquet* webtvBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_WEBTV), false, true);
webtvBouquet->channelList->SetChannelList(&zapitList); webtvBouquet->channelList->SetChannelList(&webtvList);
TVallList->Bouquets.push_back(webtvBouquet); TVallList->Bouquets.push_back(webtvBouquet);
/* provider */
webtvBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_WEBTV), false, true);
webtvBouquet->channelList->SetChannelList(&zapitList);
TVbouquetList->Bouquets.push_back(webtvBouquet);
/* "satellite" */ /* "satellite" */
webtvBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_WEBTV), false, true); webtvBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_WEBTV), false, true);
webtvBouquet->channelList->SetChannelList(&zapitList); webtvBouquet->channelList->SetChannelList(&webtvList);
TVsatList->Bouquets.push_back(webtvBouquet); TVsatList->Bouquets.push_back(webtvBouquet);
printf("[neutrino] got %d WebTV channels\n", (int)zapitList.size()); fflush(stdout); printf("[neutrino] got %d WebTV channels\n", (int)webtvList.size()); fflush(stdout);
} }
} }
/* all HD channels */ /* all HD channels */
@@ -1467,7 +1465,7 @@ void CNeutrinoApp::channelsInit(bool bOnly)
for (i = 0; i < g_bouquetManager->Bouquets.size(); i++) { for (i = 0; i < g_bouquetManager->Bouquets.size(); i++) {
CZapitBouquet *b = g_bouquetManager->Bouquets[i]; CZapitBouquet *b = g_bouquetManager->Bouquets[i];
if (!b->bHidden) { if (!b->bHidden) {
if (b->getTvChannels(zapitList) /*|| b->bFav */) { if (b->getTvChannels(zapitList) || (g_settings.show_empty_favorites && b->bUser)) {
if(b->bUser) if(b->bUser)
tmp = TVfavList->addBouquet(b); tmp = TVfavList->addBouquet(b);
else else
@@ -1476,7 +1474,7 @@ void CNeutrinoApp::channelsInit(bool bOnly)
tmp->channelList->SetChannelList(&zapitList); tmp->channelList->SetChannelList(&zapitList);
tvi++; tvi++;
} }
if (b->getRadioChannels(zapitList) /* || b->bFav */) { if (b->getRadioChannels(zapitList) || (g_settings.show_empty_favorites && b->bUser)) {
if(b->bUser) if(b->bUser)
tmp = RADIOfavList->addBouquet(b); tmp = RADIOfavList->addBouquet(b);
else else
@@ -1489,6 +1487,12 @@ void CNeutrinoApp::channelsInit(bool bOnly)
AllFavBouquetList->addBouquet(b); AllFavBouquetList->addBouquet(b);
} }
} }
if (!webtvList.empty()) {
/* provider */
CBouquet* webtvBouquet = new CBouquet(0, g_Locale->getText(LOCALE_BOUQUETNAME_WEBTV), false, true);
webtvBouquet->channelList->SetChannelList(&webtvList);
TVbouquetList->Bouquets.push_back(webtvBouquet);
}
printf("[neutrino] got %d TV and %d RADIO bouquets\n", tvi, ri); fflush(stdout); printf("[neutrino] got %d TV and %d RADIO bouquets\n", tvi, ri); fflush(stdout);
TIMER_STOP("[neutrino] took"); TIMER_STOP("[neutrino] took");