From 72d16ac7c6aeb40696bae38392e56d0630009703 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Fri, 14 Feb 2020 23:09:26 +0100 Subject: [PATCH] - webradio-setup/controlapi: get webradio via xmltv Conflicts: src/nhttpd/tuxboxapi/controlapi.cpp Signed-off-by: Thilo Graf --- src/nhttpd/tuxboxapi/controlapi.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index 0c401937d..40341a1db 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -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 = CZapitClient::MODE_TV; m < CZapitClient::MODE_ALL; m++) + for (int m = 0; m < 2; m++) { - if (m == CZapitClient::MODE_RADIO) + if (m == 0) + g_bouquetManager->Bouquets[i]->getTvChannels(chanlist); + else g_bouquetManager->Bouquets[i]->getRadioChannels(chanlist); if(!chanlist.empty() && !g_bouquetManager->Bouquets[i]->bHidden && g_bouquetManager->Bouquets[i]->bUser)