mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 01:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

- rename webtv-setup => webchannels-setup

Browse Source 
Conflicts:
	src/gui/user_menue.cpp
	src/gui/webchannels_setup.cpp
	src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2020-09-13 23:43:47 +02:00
committed by Thilo Graf
parent 80c339efe4
commit 0c1091e859
11 changed files with 58 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/neutrino.cpp
View File

@@ -101,7 +101,7 @@
#include "gui/videosettings.h"
#include "gui/audio_select.h"
#include "gui/weather.h"
#include "gui/webtv_setup.h"
#include "gui/webchannels_setup.h"
#include "gui/widget/hintbox.h"
#include "gui/widget/icons.h"
@@ -843,8 +843,8 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.webtv_xml.push_back(webtv_xml);
}
CWebTVSetup webtvsetup;
webtvsetup.webtv_xml_auto();
CWebChannelsSetup webchannelssetup;
webchannelssetup.webtv_xml_auto();
g_settings.webradio_xml_auto = configfile.getInt32("webradio_xml_auto", 1);
g_settings.webradio_xml.clear();
#ifndef BOXMODEL_CST_HD1
@@ -868,7 +868,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.webradio_xml.push_back(webradio_xml);
}
webtvsetup.webradio_xml_auto();
webchannelssetup.webradio_xml_auto();
#endif
g_settings.xmltv_xml.clear();
@@ -1713,12 +1713,12 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setString ( "logo_hdd_dir", g_settings.logo_hdd_dir );
CWebTVSetup webtvsetup;
CWebChannelsSetup webchannelssetup;
configfile.setInt32("webtv_xml_auto", g_settings.webtv_xml_auto);
int webtv_count = 0;
for (std::list<std::string>::iterator it = g_settings.webtv_xml.begin(); it != g_settings.webtv_xml.end(); ++it) {
std::string k = "webtv_xml_" + to_string(webtv_count);
if (webtvsetup.webtv_xml_autodir((*it)))
if (webchannelssetup.webtv_xml_autodir((*it)))
continue;
configfile.setString(k, *it);
webtv_count++;
@@ -1729,7 +1729,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
int webradio_count = 0;
for (std::list<std::string>::iterator it = g_settings.webradio_xml.begin(); it != g_settings.webradio_xml.end(); ++it) {
std::string k = "webradio_xml_" + to_string(webradio_count);
if (webtvsetup.webradio_xml_autodir((*it)))
if (webchannelssetup.webradio_xml_autodir((*it)))
continue;
configfile.setString(k, *it);
webradio_count++;