a bit more readability in latest changes

Origin commit data
------------------
Branch: ni/coolstream
Commit: bfddde6478
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-02-16 (Sun, 16 Feb 2020)

Origin message was:
------------------
- a bit more readability in latest changes

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-02-16 00:22:09 +01:00
parent 32bee3a2f1
commit 0d51554a87
2 changed files with 6 additions and 6 deletions

View File

@@ -543,9 +543,9 @@ t_channel_id getepgid(std::string epg_name)
CBouquetManager::ChannelIterator cit = g_bouquetManager->tvChannelsBegin(); CBouquetManager::ChannelIterator cit = g_bouquetManager->tvChannelsBegin();
// FIXME: Maybe there's a nicer solution // FIXME: Maybe there's a nicer solution
for (int m = 0; m < 2; m++) for (int m = CZapitClient::MODE_TV; m < CZapitClient::MODE_ALL; m++)
{ {
if (m == 1) if (m == CZapitClient::MODE_RADIO)
cit = g_bouquetManager->radioChannelsBegin(); cit = g_bouquetManager->radioChannelsBegin();
for (; !(cit.EndOfChannels()); cit++) for (; !(cit.EndOfChannels()); cit++)

View File

@@ -3263,12 +3263,12 @@ void CControlAPI::xmltvepgCGI(CyhookHandler *hh)
for (int i = 0; i < (int) g_bouquetManager->Bouquets.size(); i++) for (int i = 0; i < (int) g_bouquetManager->Bouquets.size(); i++)
{ {
g_bouquetManager->Bouquets[i]->getTvChannels(chanlist);
// FIXME: Maybe there's a nicer solution // FIXME: Maybe there's a nicer solution
for (int m = 0; m < 2; m++) for (int m = CZapitClient::MODE_TV; m < CZapitClient::MODE_ALL; m++)
{ {
if (m == 0) if (m == CZapitClient::MODE_RADIO)
g_bouquetManager->Bouquets[i]->getTvChannels(chanlist);
else
g_bouquetManager->Bouquets[i]->getRadioChannels(chanlist); g_bouquetManager->Bouquets[i]->getRadioChannels(chanlist);
if(!chanlist.empty() && !g_bouquetManager->Bouquets[i]->bHidden && g_bouquetManager->Bouquets[i]->bUser) if(!chanlist.empty() && !g_bouquetManager->Bouquets[i]->bHidden && g_bouquetManager->Bouquets[i]->bUser)