From d5394ea9d890504bd9af9c161a5bf392bbfda981 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sat, 1 Sep 2018 14:34:25 +0200
Subject: [PATCH] rename g_settings.webepg* to g_settings.xmltv* because it is
 XMLTV; see http://wiki.xmltv.org

By courtesy of TangoCash. :)


Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/5dae193c84cf8c488fb015c1e763a36ee4ee5138
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
---
 src/neutrino.cpp      | 36 ++++++++++++++++++------------------
 src/system/settings.h |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 2103a59ba..8aa749952 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -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();
diff --git a/src/system/settings.h b/src/system/settings.h
index 2c4ade465..c59801ef8 100644
--- a/src/system/settings.h
+++ b/src/system/settings.h
@@ -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