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

zapit bouquets: force creating Other bouquet for unused channels

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: bcae2e2b89
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-13 (Fri, 13 Jan 2012)


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

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-01-13 14:58:22 +04:00
parent b86f28e508
commit 431ee75f43
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/zapit/src/bouquets.cpp
View File

@@ -410,7 +410,8 @@ void CBouquetManager::renumChannels(ZapitChannelList &list, int & counter, char
void CBouquetManager::makeRemainingChannelsBouquet(void) void CBouquetManager::makeRemainingChannelsBouquet(void)
{ {
ZapitChannelList unusedChannels; ZapitChannelList unusedChannels;
bool tomake = CZapit::getInstance()->makeRemainingChannelsBouquet(); //FIXME services loaded before config.
//bool tomake = CZapit::getInstance()->makeRemainingChannelsBouquet();
/* reset channel number and has_bouquet flag */ /* reset channel number and has_bouquet flag */
CServiceManager::getInstance()->ResetChannelNumbers(); CServiceManager::getInstance()->ResetChannelNumbers();
@@ -421,7 +422,7 @@ void CBouquetManager::makeRemainingChannelsBouquet(void)
renumChannels((*it)->radioChannels, j, (*it)->bUser ? NULL : (char *) (*it)->Name.c_str()); renumChannels((*it)->radioChannels, j, (*it)->bUser ? NULL : (char *) (*it)->Name.c_str());
} }
if(!tomake || CServiceManager::getInstance()->GetAllUnusedChannels(unusedChannels) == false) if(/*!tomake ||*/ CServiceManager::getInstance()->GetAllUnusedChannels(unusedChannels) == false)
return; return;
sort(unusedChannels.begin(), unusedChannels.end(), CmpChannelByChName()); sort(unusedChannels.begin(), unusedChannels.end(), CmpChannelByChName());