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

- webtv-setup: implement webradio-setup into webtv-setup code

Browse Source 
Conflicts:
	src/gui/webtv_setup.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2018-09-25 23:53:35 +02:00
committed by Thilo Graf
parent 1473bca983
commit e3a5dbf6f4
10 changed files with 101 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/neutrino.cpp
View File

@@ -621,6 +621,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.network_nfs_recordingdir = configfile.getString( "network_nfs_recordingdir", "/media/sda1/movies" );
g_settings.timeshiftdir = configfile.getString( "timeshiftdir", "" );
g_settings.downloadcache_dir = configfile.getString( "downloadcache_dir", g_settings.network_nfs_recordingdir.c_str());
g_settings.last_webradio_dir = configfile.getString( "last_webradio_dir", CONFIGDIR);
g_settings.last_webtv_dir = configfile.getString( "last_webtv_dir", CONFIGDIR);
g_settings.temp_timeshift = configfile.getInt32( "temp_timeshift", 0 );
@@ -730,9 +731,20 @@ int CNeutrinoApp::loadSetup(const char * fname)
because of driver- or firmware-issues or so. Not sure.
So let's avoid loading webradio_xml to get an empty webradio bouquet.
*/
std::string webradio_xml = configfile.getString("webradio_xml", WEBRADIO_XML);
if (file_size(webradio_xml.c_str()))
g_settings.webradio_xml.push_back(webradio_xml);
int webradio_count = configfile.getInt32("webradio_xml_count", 0);
if (webradio_count) {
for (int i = 0; i < webradio_count; i++) {
std::string k = "webradio_xml_" + to_string(i);
std::string webradio_xml = configfile.getString(k, "");
if (webradio_xml.empty())
continue;
g_settings.webradio_xml.push_back(webradio_xml);
}
} else {
std::string webradio_xml = configfile.getString("webradio_xml", WEBRADIO_XML);
if (file_size(webradio_xml.c_str()))
g_settings.webradio_xml.push_back(webradio_xml);
}
#endif
g_settings.xmltv_xml.clear();
@@ -1396,6 +1408,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setString( "network_nfs_recordingdir", g_settings.network_nfs_recordingdir);
configfile.setString( "timeshiftdir", g_settings.timeshiftdir);
configfile.setString( "downloadcache_dir", g_settings.downloadcache_dir);
configfile.setString( "last_webradio_dir", g_settings.last_webradio_dir);
configfile.setString( "last_webtv_dir", g_settings.last_webtv_dir);
configfile.setBool ("filesystem_is_utf8" , g_settings.filesystem_is_utf8 );
@@ -1439,6 +1452,14 @@ void CNeutrinoApp::saveSetup(const char * fname)
}
configfile.setInt32 ( "webtv_xml_count", g_settings.webtv_xml.size());
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);
configfile.setString(k, *it);
webradio_count++;
}
configfile.setInt32 ( "webradio_xml_count", webradio_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);