mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 00:41:09 +02:00
xmltv: move code to read xmltv.xml to the already existing place where epg is read
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1239c132dd
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-09-01 (Sat, 01 Sep 2018)
Origin message was:
------------------
- xmltv: move code to read xmltv.xml to the already existing place where epg is read
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -2284,9 +2284,13 @@ void CNeutrinoApp::InitZapper()
|
||||
|
||||
g_InfoViewer->start();
|
||||
SendSectionsdConfig();
|
||||
if (g_settings.epg_read) {
|
||||
if(stat(g_settings.epg_dir.c_str(), &my_stat) == 0)
|
||||
if (g_settings.epg_read)
|
||||
{
|
||||
if (stat(g_settings.epg_dir.c_str(), &my_stat) == 0)
|
||||
g_Sectionsd->readSIfromXML(g_settings.epg_dir.c_str());
|
||||
|
||||
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());
|
||||
}
|
||||
int tvmode = CZapit::getInstance()->getMode() & CZapitClient::MODE_TV;
|
||||
lastChannelMode = tvmode ? g_settings.channel_mode : g_settings.channel_mode_radio;
|
||||
@@ -2774,9 +2778,6 @@ TIMER_STOP("################################## after all #######################
|
||||
CFlashUpdateCheck::getInstance()->startThread();
|
||||
}
|
||||
|
||||
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());
|
||||
|
||||
RealRun();
|
||||
ExitRun(g_info.hw_caps->can_shutdown);
|
||||
|
||||
|
Reference in New Issue
Block a user