From fafe6cf8d338012ea3adafb7723b59c3ec6f5ff5 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 31 Aug 2021 22:47:09 +0200 Subject: [PATCH] Revert "simplify epg-injection" This reverts commit 131fd78f399bd580766eac112d8b7209bb51f28c. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/55cc49767b5e5445d29ffbd779b89d41f69ac13b Author: vanhofen Date: 2021-08-31 (Tue, 31 Aug 2021) ------------------ This commit was generated by Migit --- src/zapit/src/bouquets.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/zapit/src/bouquets.cpp b/src/zapit/src/bouquets.cpp index 2e21ae101..01de9a974 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->getEpgID() & 0xFFFFFFFFFFFFULL); + snprintf(buf, sizeof(buf), "%llx", chan->getChannelID() & 0xFFFFFFFFFFFFULL); chan->setEPGmap("#" + new_epgxml + "=" + buf); } newBouquet->addService(chan); @@ -969,8 +969,9 @@ void CBouquetManager::loadWebchannels(int mode) std::string new_epgxml = reMapEpgXML(chid); if(!new_epgxml.empty()) { char buf[100]; - snprintf(buf, sizeof(buf), "%llx", channel->getEpgID() & 0xFFFFFFFFFFFFULL); + snprintf(buf, sizeof(buf), "%llx", chid & 0xFFFFFFFFFFFFULL); channel->setEPGmap("#" + new_epgxml + "=" + buf); + channel->setEPGid(chid); } channel->flags = CZapitChannel::UPDATED; if (gbouquet) @@ -1083,8 +1084,9 @@ void CBouquetManager::loadWebchannels(int mode) std::string new_epgxml = reMapEpgXML(chid); if(!new_epgxml.empty()) { char buf[100]; - snprintf(buf, sizeof(buf), "%llx", channel->getEpgID() & 0xFFFFFFFFFFFFULL); + snprintf(buf, sizeof(buf), "%llx", chid & 0xFFFFFFFFFFFFULL); channel->setEPGmap("#" + new_epgxml + "=" + buf); + channel->setEPGid(chid); } desc = "m3u_loading_logos"; if (!alogo.empty() && !g_PicViewer->GetLogoName(chid,title,desc)) @@ -1191,8 +1193,9 @@ void CBouquetManager::loadWebchannels(int mode) std::string new_epgxml = reMapEpgXML(chid); if(!new_epgxml.empty()) { char buf[100]; - snprintf(buf, sizeof(buf), "%llx", channel->getEpgID() & 0xFFFFFFFFFFFFULL); + snprintf(buf, sizeof(buf), "%llx", chid & 0xFFFFFFFFFFFFULL); channel->setEPGmap("#" + new_epgxml + "=" + buf); + channel->setEPGid(chid); } channel->flags = CZapitChannel::UPDATED; if (gbouquet)