From ae1e7117eb8a1ee852fa7c1fbd02ae037bc2d547 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Mon, 30 Aug 2021 20:43:16 +0200 Subject: [PATCH] simplify epg-injection --- src/zapit/src/bouquets.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/zapit/src/bouquets.cpp b/src/zapit/src/bouquets.cpp index 77f856cb0..718a34ea7 100644 --- a/src/zapit/src/bouquets.cpp +++ b/src/zapit/src/bouquets.cpp @@ -479,7 +479,7 @@ void CBouquetManager::parseBouquetsXml(const char *fname, bool bUser) std::string new_epgxml = reMapEpgXML(chan->getChannelID()); if(!new_epgxml.empty()) { char buf[100]; - snprintf(buf, sizeof(buf), "%llx", chan->getChannelID() & 0xFFFFFFFFFFFFULL); + snprintf(buf, sizeof(buf), "%llx", chan->getEpgID() & 0xFFFFFFFFFFFFULL); chan->setEPGmap("#" + new_epgxml + "=" + buf); } newBouquet->addService(chan); @@ -969,9 +969,8 @@ void CBouquetManager::loadWebchannels(int mode) std::string new_epgxml = reMapEpgXML(chid); if(!new_epgxml.empty()) { char buf[100]; - snprintf(buf, sizeof(buf), "%llx", chid & 0xFFFFFFFFFFFFULL); + snprintf(buf, sizeof(buf), "%llx", channel->getEpgID() & 0xFFFFFFFFFFFFULL); channel->setEPGmap("#" + new_epgxml + "=" + buf); - channel->setEPGid(chid); } channel->flags = CZapitChannel::UPDATED; if (gbouquet) @@ -1084,9 +1083,8 @@ void CBouquetManager::loadWebchannels(int mode) std::string new_epgxml = reMapEpgXML(chid); if(!new_epgxml.empty()) { char buf[100]; - snprintf(buf, sizeof(buf), "%llx", chid & 0xFFFFFFFFFFFFULL); + snprintf(buf, sizeof(buf), "%llx", channel->getEpgID() & 0xFFFFFFFFFFFFULL); channel->setEPGmap("#" + new_epgxml + "=" + buf); - channel->setEPGid(chid); } desc = "m3u_loading_logos"; if (!alogo.empty() && !g_PicViewer->GetLogoName(chid,title,desc)) @@ -1193,9 +1191,8 @@ void CBouquetManager::loadWebchannels(int mode) std::string new_epgxml = reMapEpgXML(chid); if(!new_epgxml.empty()) { char buf[100]; - snprintf(buf, sizeof(buf), "%llx", chid & 0xFFFFFFFFFFFFULL); + snprintf(buf, sizeof(buf), "%llx", channel->getEpgID() & 0xFFFFFFFFFFFFULL); channel->setEPGmap("#" + new_epgxml + "=" + buf); - channel->setEPGid(chid); } channel->flags = CZapitChannel::UPDATED; if (gbouquet)