diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 38d6bd214..0a982cd2d 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -714,18 +714,6 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.webtv_xml.push_back(webtv_xml); } - 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 /* @@ -738,6 +726,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 ); @@ -1425,13 +1425,13 @@ void CNeutrinoApp::saveSetup(const char * fname) } configfile.setInt32 ( "webtv_xml_count", g_settings.webtv_xml.size()); - int webepg_count = 0; - for (std::list::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::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(); @@ -2583,7 +2583,7 @@ TIMER_STOP("################################## after all ####################### delete hintBox; } - for (std::list::iterator it = g_settings.webepg_xml.begin(); it != g_settings.webepg_xml.end(); ++it) + for (std::list::iterator it = g_settings.xmltv_xml.begin(); it != g_settings.xmltv_xml.end(); ++it) g_Sectionsd->readSIfromXMLTV((*it).c_str()); RealRun(); diff --git a/src/system/settings.h b/src/system/settings.h index d4e714fcb..38b55cddd 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -324,7 +324,7 @@ struct SNeutrinoSettings std::list webtv_xml; std::list webradio_xml; - std::list webepg_xml; + std::list xmltv_xml; // see http://wiki.xmltv.org/ //personalize enum PERSONALIZE_SETTINGS //settings.h