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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	lib/timerdclient/timerdtypes.h
	src/gui/channellist.cpp
	src/system/httptool.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0bb2f888c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-21 11:23:51 +02:00
parent 9bdd4c7ee6 a41206902f
commit 108cf42786
15 changed files with 577 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/neutrino.cpp
View File

@@ -502,6 +502,18 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.shutdown_min = configfile.getInt32("shutdown_min", 000); //NI
g_settings.sleeptimer_min = configfile.getInt32("sleeptimer_min", 0);
g_settings.timer_remotebox_ip.clear();
int timer_remotebox_ip_count = configfile.getInt32("timer_remotebox_ip_count", 0);
if (timer_remotebox_ip_count) {
for (int i = 0; i < timer_remotebox_ip_count; i++) {
std::string k = "timer_remotebox_ip_" + to_string(i);
std::string timer_remotebox_ip = configfile.getString(k, "");
if (timer_remotebox_ip.empty())
continue;
g_settings.timer_remotebox_ip.push_back(timer_remotebox_ip);
}
}
g_settings.infobar_sat_display = configfile.getBool("infobar_sat_display" , true );
g_settings.infobar_show_channeldesc = configfile.getBool("infobar_show_channeldesc" , false );
g_settings.infobar_subchan_disp_pos = configfile.getInt32("infobar_subchan_disp_pos" , 0 );
@@ -1139,6 +1151,15 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32("shutdown_count" , g_settings.shutdown_count);
configfile.setInt32("shutdown_min" , g_settings.shutdown_min );
configfile.setInt32("sleeptimer_min", g_settings.sleeptimer_min);
int timer_remotebox_ip_count = 0;
for (std::list<std::string>::iterator it = g_settings.timer_remotebox_ip.begin(); it != g_settings.timer_remotebox_ip.end(); ++it) {
std::string k = "timer_remotebox_ip_" + to_string(timer_remotebox_ip_count);
configfile.setString(k, *it);
timer_remotebox_ip_count++;
}
configfile.setInt32 ( "timer_remotebox_ip_count", g_settings.timer_remotebox_ip.size());
configfile.setBool("infobar_sat_display" , g_settings.infobar_sat_display );
configfile.setBool("infobar_show_channeldesc" , g_settings.infobar_show_channeldesc );
configfile.setInt32("infobar_subchan_disp_pos" , g_settings.infobar_subchan_disp_pos );