mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

local epgmap overrides global epgmap for webtv,webradio

Browse Source
This commit is contained in:
TangoCash
2021-09-13 17:37:15 +02:00
committed by Thilo Graf
parent 4eff599c4d
commit 32b482ffa5
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/zapit/src/bouquets.cpp
View File

@@ -972,23 +972,22 @@ void CBouquetManager::loadWebchannels(int mode)
t_channel_id new_epgid = reMapEpgID(chid); t_channel_id new_epgid = reMapEpgID(chid);
if(new_epgid) if(new_epgid)
channel->setEPGid(new_epgid); channel->setEPGid(new_epgid);
char buf[100];
snprintf(buf, sizeof(buf), "%llx", chid & 0xFFFFFFFFFFFFULL);
if (xmltv) if (xmltv)
{ {
CNeutrinoApp::getInstance()->g_settings_xmltv_xml_auto_pushback(xmltv); CNeutrinoApp::getInstance()->g_settings_xmltv_xml_auto_pushback(std::string(xmltv));
} }
if (epgmap) char buf[100];
{ snprintf(buf, sizeof(buf), "%llx", chid & 0xFFFFFFFFFFFFULL);
std::string new_epgxml(epgmap); std::string new_epgxml = reMapEpgXML(chid);
if(!new_epgxml.empty()) {
channel->setEPGmap("#" + new_epgxml + "=" + buf); channel->setEPGmap("#" + new_epgxml + "=" + buf);
} }
else // local epgmap overrides global epgmap
if (epgmap)
{ {
std::string new_epgxml = reMapEpgXML(chid); std::string new_epgmap(epgmap);
if(!new_epgxml.empty()) { if(!new_epgmap.empty())
channel->setEPGmap("#" + new_epgxml + "=" + buf); channel->setEPGmap("#" + new_epgmap + "=" + buf);
}
} }
channel->flags = CZapitChannel::UPDATED; channel->flags = CZapitChannel::UPDATED;
if (gbouquet) if (gbouquet)