diff --git a/src/gui/webchannels_setup.cpp b/src/gui/webchannels_setup.cpp index 071cb2bda..55b62d9e1 100644 --- a/src/gui/webchannels_setup.cpp +++ b/src/gui/webchannels_setup.cpp @@ -278,7 +278,7 @@ int CWebChannelsSetup::Show() } webchannels_auto(); g_Zapit->reinitChannels(); - CNeutrinoApp::getInstance()->xmltv_xml_m3u_readepg(); + CNeutrinoApp::getInstance()->xmltv_xml_auto_readepg(); changed = false; hint.hide(); } diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 82755a6f9..1cac604d6 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -969,7 +969,6 @@ int CNeutrinoApp::loadSetup(const char *fname) } g_settings.xmltv_xml_auto.clear(); - g_settings.xmltv_xml_m3u.clear(); g_settings.livestreamResolution = configfile.getInt32("livestreamResolution", 1920); g_settings.livestreamScriptPath = configfile.getString("livestreamScriptPath", WEBTVDIR); @@ -3329,7 +3328,7 @@ TIMER_STOP("################################## after all ####################### #endif xmltv_xml_readepg(); - xmltv_xml_m3u_readepg(); + xmltv_xml_auto_readepg(); RealRun(); ExitRun(g_info.hw_caps->can_shutdown); @@ -4727,7 +4726,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) else if (msg == NeutrinoMessages::EVT_RELOAD_XMLTV) { printf("CNeutrinoApp::handleMsg: reload xmltv epg\n"); xmltv_xml_readepg(); - xmltv_xml_m3u_readepg(); + xmltv_xml_auto_readepg(); return messages_return::handled; } if ((msg >= CRCInput::RC_WithData) && (msg < CRCInput::RC_WithData + 0x10000000)) { diff --git a/src/neutrino.h b/src/neutrino.h index 4c54fb718..5da63aca3 100644 --- a/src/neutrino.h +++ b/src/neutrino.h @@ -257,22 +257,11 @@ public: { for (std::list::iterator it = g_settings.xmltv_xml.begin(); it != g_settings.xmltv_xml.end(); it++) g_Sectionsd->readSIfromXMLTV((*it).c_str()); + } + void xmltv_xml_auto_readepg() + { for (std::list::iterator it = g_settings.xmltv_xml_auto.begin(); it != g_settings.xmltv_xml_auto.end(); it++) g_Sectionsd->readSIfromXMLTV((*it).c_str()); } - - void g_settings_xmltv_xml_m3u_clear() - { - g_settings.xmltv_xml_m3u.clear(); - } - void g_settings_xmltv_xml_m3u_pushback(std::string _epg_url) - { - g_settings.xmltv_xml_m3u.push_back(_epg_url); - } - void xmltv_xml_m3u_readepg() - { - for (std::list::iterator it = g_settings.xmltv_xml_m3u.begin(); it != g_settings.xmltv_xml_m3u.end(); it++) - g_Sectionsd->readSIfromXMLTV((*it).c_str()); - } }; #endif diff --git a/src/system/settings.h b/src/system/settings.h index 35f22d06a..54ef47f43 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -753,7 +753,6 @@ struct SNeutrinoSettings // xmltv std::list xmltv_xml; // see http://wiki.xmltv.org/ std::list xmltv_xml_auto; - std::list xmltv_xml_m3u; // contains temp xml from m3u int livestreamResolution; std::string livestreamScriptPath; diff --git a/src/zapit/src/bouquets.cpp b/src/zapit/src/bouquets.cpp index 773baff33..ee9a4e39f 100644 --- a/src/zapit/src/bouquets.cpp +++ b/src/zapit/src/bouquets.cpp @@ -535,7 +535,6 @@ void CBouquetManager::loadBouquets(bool ignoreBouquetFile) } CNeutrinoApp::getInstance()->g_settings_xmltv_xml_auto_clear(); - CNeutrinoApp::getInstance()->g_settings_xmltv_xml_m3u_clear(); loadWebtv(); loadWebradio(); loadLogos(); @@ -1039,10 +1038,10 @@ void CBouquetManager::loadWebchannels(int mode) { std::vector epg_list = ::split(epg_url, ','); for (std::vector::iterator it_epg = epg_list.begin(); it_epg != epg_list.end(); it_epg++) - CNeutrinoApp::getInstance()->g_settings_xmltv_xml_m3u_pushback((*it_epg)); + CNeutrinoApp::getInstance()->g_settings_xmltv_xml_auto_pushback((*it_epg)); } else - CNeutrinoApp::getInstance()->g_settings_xmltv_xml_m3u_pushback(epg_url); + CNeutrinoApp::getInstance()->g_settings_xmltv_xml_auto_pushback(epg_url); } } if (strLine.find(M3U_INFO_MARKER) != std::string::npos)