- a bit more readability in latest changes

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2020-02-16 00:22:09 +01:00
committed by Thilo Graf
parent 79a9c6dd44
commit f88c398f87
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();
// 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();
for (; !(cit.EndOfChannels()); cit++)

View File

@@ -3247,12 +3247,12 @@ void CControlAPI::xmltvepgCGI(CyhookHandler *hh)
for (int i = 0; i < (int) g_bouquetManager->Bouquets.size(); i++)
{
g_bouquetManager->Bouquets[i]->getTvChannels(chanlist);
// 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)
g_bouquetManager->Bouquets[i]->getTvChannels(chanlist);
else
if (m == CZapitClient::MODE_RADIO)
g_bouquetManager->Bouquets[i]->getRadioChannels(chanlist);
if(!chanlist.empty() && !g_bouquetManager->Bouquets[i]->bHidden && g_bouquetManager->Bouquets[i]->bUser)