mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

rename webtv-setup => webchannels-setup

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: e3cf2920a5
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-09-13 (Sun, 13 Sep 2020)

Origin message was:
------------------
- rename webtv-setup => webchannels-setup

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-09-13 23:43:47 +02:00
parent b53c30a1d9
commit dc0fca4600
11 changed files with 57 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
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" //NI
#include "gui/webchannels_setup.h"
#include "gui/widget/hintbox.h"
#include "gui/widget/icons.h"
@@ -853,9 +853,8 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.webtv_xml.push_back(webtv_xml);
}
//NI
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();
@@ -880,7 +879,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();
@@ -1772,12 +1771,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); //NI
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++;
@@ -1788,7 +1787,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++;