From 089044723d09eda369b8667deec6fa4024b36300 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 1 Sep 2018 14:34:25 +0200 Subject: [PATCH] webepg: align new keys/values to the existing keys/values By courtesy of TangoCash. :) Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/632dfd2aae922c0b64994aa9437ade7717dce0ec Author: vanhofen Date: 2018-09-01 (Sat, 01 Sep 2018) Origin message was: ------------------ - webepg: align new keys/values to the existing keys/values By courtesy of TangoCash. :) ------------------ This commit was generated by Migit --- src/neutrino.cpp | 20 ++++++++++---------- src/system/settings.h | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 22db40405..5aaf3eaa9 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -775,15 +775,15 @@ int CNeutrinoApp::loadSetup(const char * fname) CWebTVSetup webtvsetup; webtvsetup.webtv_xml_auto(); - g_settings.web_epg.clear(); - int webepg_count = configfile.getInt32("webepg_count", 0); + 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_" + to_string(i); - std::string web_epg = configfile.getString(k, ""); - if (web_epg.empty()) + std::string k = "webepg_xml_" + to_string(i); + std::string webepg_xml = configfile.getString(k, ""); + if (webepg_xml.empty()) continue; - g_settings.web_epg.push_back(web_epg); + g_settings.webepg_xml.push_back(webepg_xml); } } @@ -1575,12 +1575,12 @@ void CNeutrinoApp::saveSetup(const char * fname) configfile.setInt32 ( "webtv_xml_count", webtv_count); //NI int webepg_count = 0; - for (std::list::iterator it = g_settings.web_epg.begin(); it != g_settings.web_epg.end(); ++it) { - std::string k = "webepg_" + to_string(webepg_count); + 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); configfile.setString(k, *it); webepg_count++; } - configfile.setInt32 ( "webepg_count", g_settings.web_epg.size()); + configfile.setInt32 ( "webepg_xml_count", g_settings.webepg_xml.size()); saveKeys(); @@ -2774,7 +2774,7 @@ TIMER_STOP("################################## after all ####################### CFlashUpdateCheck::getInstance()->startThread(); } - for (std::list::iterator it = g_settings.web_epg.begin(); it != g_settings.web_epg.end(); ++it) + for (std::list::iterator it = g_settings.webepg_xml.begin(); it != g_settings.webepg_xml.end(); ++it) g_Sectionsd->readSIfromIPTVXML((*it).c_str()); RealRun(); diff --git a/src/system/settings.h b/src/system/settings.h index 5b1571f1b..2c4ade465 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -329,7 +329,7 @@ struct SNeutrinoSettings std::list webtv_xml; std::list webradio_xml; - std::list web_epg; + std::list webepg_xml; //personalize enum PERSONALIZE_SETTINGS //settings.h