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

webepg: align new keys/values to the existing keys/values

Browse Source 
By courtesy of TangoCash. :)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 632dfd2aae
Author: vanhofen <vanhofen@gmx.de>
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
This commit is contained in:
vanhofen
2018-09-01 14:34:25 +02:00
parent 4f019bf8e8
commit 089044723d
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/neutrino.cpp
View File

@@ -775,15 +775,15 @@ int CNeutrinoApp::loadSetup(const char * fname)
CWebTVSetup webtvsetup; CWebTVSetup webtvsetup;
webtvsetup.webtv_xml_auto(); webtvsetup.webtv_xml_auto();
g_settings.web_epg.clear(); g_settings.webepg_xml.clear();
int webepg_count = configfile.getInt32("webepg_count", 0); int webepg_count = configfile.getInt32("webepg_xml_count", 0);
if (webepg_count) { if (webepg_count) {
for (int i = 0; i < webepg_count; i++) { for (int i = 0; i < webepg_count; i++) {
std::string k = "webepg_" + to_string(i); std::string k = "webepg_xml_" + to_string(i);
std::string web_epg = configfile.getString(k, ""); std::string webepg_xml = configfile.getString(k, "");
if (web_epg.empty()) if (webepg_xml.empty())
continue; 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 configfile.setInt32 ( "webtv_xml_count", webtv_count); //NI
int webepg_count = 0; int webepg_count = 0;
for (std::list<std::string>::iterator it = g_settings.web_epg.begin(); it != g_settings.web_epg.end(); ++it) { for (std::list<std::string>::iterator it = g_settings.webepg_xml.begin(); it != g_settings.webepg_xml.end(); ++it) {
std::string k = "webepg_" + to_string(webepg_count); std::string k = "webepg_xml_" + to_string(webepg_count);
configfile.setString(k, *it); configfile.setString(k, *it);
webepg_count++; webepg_count++;
} }
configfile.setInt32 ( "webepg_count", g_settings.web_epg.size()); configfile.setInt32 ( "webepg_xml_count", g_settings.webepg_xml.size());
saveKeys(); saveKeys();
@@ -2774,7 +2774,7 @@ TIMER_STOP("################################## after all #######################
CFlashUpdateCheck::getInstance()->startThread(); CFlashUpdateCheck::getInstance()->startThread();
} }
for (std::list<std::string>::iterator it = g_settings.web_epg.begin(); it != g_settings.web_epg.end(); ++it) for (std::list<std::string>::iterator it = g_settings.webepg_xml.begin(); it != g_settings.webepg_xml.end(); ++it)
g_Sectionsd->readSIfromIPTVXML((*it).c_str()); g_Sectionsd->readSIfromIPTVXML((*it).c_str());
RealRun(); RealRun();

2
src/system/settings.h
View File

@@ -329,7 +329,7 @@ struct SNeutrinoSettings
std::list<std::string> webtv_xml; std::list<std::string> webtv_xml;
std::list<std::string> webradio_xml; std::list<std::string> webradio_xml;
std::list<std::string> web_epg; std::list<std::string> webepg_xml;
//personalize //personalize
enum PERSONALIZE_SETTINGS //settings.h enum PERSONALIZE_SETTINGS //settings.h