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

add epg mapping too xml and e2 lists

Browse Source
This commit is contained in:
TangoCash
2020-07-01 23:31:07 +02:00
committed by Thilo Graf
parent 01e6aeb2ed
commit 9a3f259373
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/neutrino.cpp
View File

@@ -2990,7 +2990,7 @@ TIMER_STOP("################################## after all #######################
delete hintBox; delete hintBox;
} }
for (std::list<std::string>::iterator it = g_settings.xmltv_xml.begin(); it != g_settings.xmltv_xml.end(); ++it) for (std::list<std::string>::iterator it = g_settings.xmltv_xml.begin(); it != g_settings.xmltv_xml.end(); it++)
g_Sectionsd->readSIfromXMLTV((*it).c_str()); g_Sectionsd->readSIfromXMLTV((*it).c_str());
RealRun(); RealRun();

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

@@ -471,7 +471,7 @@ void CBouquetManager::parseBouquetsXml(const char *fname, bool bUser)
chan->pname = (char *) newBouquet->Name.c_str(); chan->pname = (char *) newBouquet->Name.c_str();
chan->bLocked = clock; chan->bLocked = clock;
chan->bUseCI = newBouquet->bUseCI; chan->bUseCI = newBouquet->bUseCI;
//remapinng epg_id //remapping epg_id
t_channel_id new_epgid = reMapEpgID(chan->getChannelID()); t_channel_id new_epgid = reMapEpgID(chan->getChannelID());
if(new_epgid) if(new_epgid)
chan->setEPGid(new_epgid); chan->setEPGid(new_epgid);
@@ -961,6 +961,16 @@ void CBouquetManager::loadWebchannels(int mode)
CZapitChannel * channel = new CZapitChannel(title, chid, url, desc, epg_id, script, mode); CZapitChannel * channel = new CZapitChannel(title, chid, url, desc, epg_id, script, mode);
CServiceManager::getInstance()->AddChannel(channel); CServiceManager::getInstance()->AddChannel(channel);
channel->flags = CZapitChannel::UPDATED; channel->flags = CZapitChannel::UPDATED;
//remapping epg_id
t_channel_id new_epgid = reMapEpgID(chid);
if(new_epgid)
channel->setEPGid(new_epgid);
std::string new_epgxml = reMapEpgXML(chid);
if(!new_epgxml.empty()) {
char buf[100];
snprintf(buf, sizeof(buf), "%llx", chid & 0xFFFFFFFFFFFFULL);
channel->setScriptName("#" + new_epgxml + "=" + buf);
}
if (gbouquet) if (gbouquet)
gbouquet->addService(channel); gbouquet->addService(channel);
} }
@@ -1062,7 +1072,7 @@ void CBouquetManager::loadWebchannels(int mode)
} }
CZapitChannel * channel = new CZapitChannel(title.c_str(), chid, url, desc.c_str(), chid, epg_script.c_str(), mode); CZapitChannel * channel = new CZapitChannel(title.c_str(), chid, url, desc.c_str(), chid, epg_script.c_str(), mode);
CServiceManager::getInstance()->AddChannel(channel); CServiceManager::getInstance()->AddChannel(channel);
//remapinng epg_id //remapping epg_id
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);
@@ -1172,6 +1182,16 @@ void CBouquetManager::loadWebchannels(int mode)
CZapitChannel * channel = new CZapitChannel(title.c_str(), chid, ::decodeUrl(url).c_str(), desc.c_str(), epg_id, NULL, mode); CZapitChannel * channel = new CZapitChannel(title.c_str(), chid, ::decodeUrl(url).c_str(), desc.c_str(), epg_id, NULL, mode);
CServiceManager::getInstance()->AddChannel(channel); CServiceManager::getInstance()->AddChannel(channel);
channel->flags = CZapitChannel::UPDATED; channel->flags = CZapitChannel::UPDATED;
//remapping epg_id
t_channel_id new_epgid = reMapEpgID(chid);
if(new_epgid)
channel->setEPGid(new_epgid);
std::string new_epgxml = reMapEpgXML(chid);
if(!new_epgxml.empty()) {
char buf[100];
snprintf(buf, sizeof(buf), "%llx", chid & 0xFFFFFFFFFFFFULL);
channel->setScriptName("#" + new_epgxml + "=" + buf);
}
if (gbouquet) if (gbouquet)
gbouquet->addService(channel); gbouquet->addService(channel);
} }