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

revert frontend/scan changes

Browse Source 
This reverts commits

01: 650510526e
02: 6a04e51e4b
03: 40398dcc09
04: e53946641a
05: 969af25d98
06: 6e83dbd629
07: 850354ba63
08: 2d808d34bd
09: d97ed9d89e
10: 8003a13b98
11: 7ae8a37364


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d5d8b367f
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-11-23 (Mon, 23 Nov 2020)

Origin message was:
------------------
- revert frontend/scan changes

This reverts commits

01: 650510526e
02: 6a04e51e4b
03: 40398dcc09
04: e53946641a
05: 969af25d98
06: 6e83dbd629
07: 850354ba63
08: 2d808d34bd
09: d97ed9d89e
10: 8003a13b98
11: 7ae8a37364


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-11-23 22:59:16 +01:00
parent 2e12cfc8f3
commit d82e09d4a1
10 changed files with 284 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/system/settings.cpp
View File

@@ -153,7 +153,7 @@ bool CScanSettings::loadSettings(const char * const fileName)
sat_TP_delsys = configfile.getInt32("sat_TP_delsys", DVB_S);
sat_TP_pilot = configfile.getInt32("sat_TP_pilot", ZPILOT_AUTO);
sat_TP_pli = configfile.getString("sat_TP_pli", "0");
sat_TP_plc = configfile.getString("sat_TP_plc", "0");
sat_TP_plc = configfile.getString("sat_TP_plc", "1");
sat_TP_plm = configfile.getInt32("sat_TP_plm", 0);
cableName = configfile.getString("cableName", cableName);
@@ -214,18 +214,9 @@ bool CScanSettings::saveSettings(const char * const fileName)
configfile.setInt32("sat_TP_delsys", sat_TP_delsys);
configfile.setInt32("sat_TP_mod", sat_TP_mod);
configfile.setInt32("sat_TP_pilot", sat_TP_pilot);
if (atoi(sat_TP_pli.c_str()) == 0)
{
configfile.setString("sat_TP_pli", "0");
configfile.setString("sat_TP_plc", "0");
configfile.setInt32("sat_TP_plm", 0);
}
else
{
configfile.setString("sat_TP_pli", sat_TP_pli);
configfile.setString("sat_TP_plc", sat_TP_plc);
configfile.setInt32("sat_TP_plm", sat_TP_plm);
}
configfile.setString("sat_TP_pli", sat_TP_pli);
configfile.setString("sat_TP_plc", sat_TP_plc);
configfile.setInt32("sat_TP_plm", sat_TP_plm);
configfile.setString("cableName", cableName);
configfile.setInt32("cable_TP_fec", cable_TP_fec);
@@ -244,10 +235,7 @@ bool CScanSettings::saveSettings(const char * const fileName)
configfile.setInt32("terrestrial_TP_guard", terrestrial_TP_guard);
configfile.setInt32("terrestrial_TP_transmit_mode", terrestrial_TP_transmit_mode);
configfile.setInt32("terrestrial_TP_delsys", terrestrial_TP_delsys);
if (atoi(terrestrial_TP_pli.c_str()) == 0)
configfile.setString("terrestrial_TP_pli", "0");
else
configfile.setString("terrestrial_TP_pli", terrestrial_TP_pli);
configfile.setString("terrestrial_TP_pli", terrestrial_TP_pli);
if(configfile.getModifiedFlag())
configfile.saveConfig(fileName);