mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 09:21:09 +02:00
zapit bouquets: force creating Other bouquet for unused channels
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:
@@ -410,7 +410,8 @@ void CBouquetManager::renumChannels(ZapitChannelList &list, int & counter, char
|
||||
void CBouquetManager::makeRemainingChannelsBouquet(void)
|
||||
{
|
||||
ZapitChannelList unusedChannels;
|
||||
bool tomake = CZapit::getInstance()->makeRemainingChannelsBouquet();
|
||||
//FIXME services loaded before config.
|
||||
//bool tomake = CZapit::getInstance()->makeRemainingChannelsBouquet();
|
||||
|
||||
/* reset channel number and has_bouquet flag */
|
||||
CServiceManager::getInstance()->ResetChannelNumbers();
|
||||
@@ -421,7 +422,7 @@ void CBouquetManager::makeRemainingChannelsBouquet(void)
|
||||
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;
|
||||
|
||||
sort(unusedChannels.begin(), unusedChannels.end(), CmpChannelByChName());
|
||||
|
Reference in New Issue
Block a user