mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

rename g_settings.webepg* to g_settings.xmltv* because it is XMLTV; see http://wiki.xmltv.org

Browse Source 
By courtesy of TangoCash. :)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5dae193c84
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-09-01 (Sat, 01 Sep 2018)

Origin message was:
------------------
- rename g_settings.webepg* to g_settings.xmltv* because it is XMLTV; see http://wiki.xmltv.org

By courtesy of TangoCash. :)


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-09-01 14:34:25 +02:00
parent ada2fe635e
commit d5394ea9d8
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/neutrino.cpp
View File

@@ -775,18 +775,6 @@ int CNeutrinoApp::loadSetup(const char * fname)
CWebTVSetup webtvsetup;
webtvsetup.webtv_xml_auto();
g_settings.webepg_xml.clear();
int webepg_count = configfile.getInt32("webepg_xml_count", 0);
if (webepg_count) {
for (int i = 0; i < webepg_count; i++) {
std::string k = "webepg_xml_" + to_string(i);
std::string webepg_xml = configfile.getString(k, "");
if (webepg_xml.empty())
continue;
g_settings.webepg_xml.push_back(webepg_xml);
}
}
g_settings.webradio_xml.clear();
#ifndef BOXMODEL_CS_HD1
/*
@@ -799,6 +787,18 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.webradio_xml.push_back(webradio_xml);
#endif
g_settings.xmltv_xml.clear();
int xmltv_count = configfile.getInt32("xmltv_xml_count", 0);
if (xmltv_count) {
for (int i = 0; i < xmltv_count; i++) {
std::string k = "xmltv_xml_" + to_string(i);
std::string xmltv_xml = configfile.getString(k, "");
if (xmltv_xml.empty())
continue;
g_settings.xmltv_xml.push_back(xmltv_xml);
}
}
loadKeys();
g_settings.timeshift_pause = configfile.getInt32( "timeshift_pause", 1 );
@@ -1574,13 +1574,13 @@ void CNeutrinoApp::saveSetup(const char * fname)
}
configfile.setInt32 ( "webtv_xml_count", webtv_count); //NI
int webepg_count = 0;
for (std::list<std::string>::iterator it = g_settings.webepg_xml.begin(); it != g_settings.webepg_xml.end(); ++it) {
std::string k = "webepg_xml_" + to_string(webepg_count);
int xmltv_count = 0;
for (std::list<std::string>::iterator it = g_settings.xmltv_xml.begin(); it != g_settings.xmltv_xml.end(); ++it) {
std::string k = "xmltv_xml_" + to_string(xmltv_count);
configfile.setString(k, *it);
webepg_count++;
xmltv_count++;
}
configfile.setInt32 ( "webepg_xml_count", g_settings.webepg_xml.size());
configfile.setInt32 ( "xmltv_xml_count", g_settings.xmltv_xml.size());
saveKeys();
@@ -2774,7 +2774,7 @@ TIMER_STOP("################################## after all #######################
CFlashUpdateCheck::getInstance()->startThread();
}
for (std::list<std::string>::iterator it = g_settings.webepg_xml.begin(); it != g_settings.webepg_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());
RealRun();

2
src/system/settings.h
View File

@@ -329,7 +329,7 @@ struct SNeutrinoSettings
std::list<std::string> webtv_xml;
std::list<std::string> webradio_xml;
std::list<std::string> webepg_xml;
std::list<std::string> xmltv_xml; // see http://wiki.xmltv.org/
//personalize
enum PERSONALIZE_SETTINGS //settings.h