add DVB-S2X support

Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f24f44353
Author: TangoCash <eric@loxat.de>
Date: 2017-12-04 (Mon, 04 Dec 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
TangoCash
2017-12-04 09:46:04 +01:00
committed by vanhofen
parent 016c074783
commit 696b3316db
13 changed files with 142 additions and 8 deletions

View File

@@ -151,6 +151,9 @@ bool CScanSettings::loadSettings(const char * const fileName)
sat_TP_mod = configfile.getInt32("sat_TP_mod", QPSK);
sat_TP_delsys = configfile.getInt32("sat_TP_delsys", DVB_S);
sat_TP_pilot = configfile.getInt32("sat_TP_pilot", ZPILOT_AUTO_SW);
sat_TP_pli = configfile.getString("sat_TP_pli", "0");
sat_TP_plc = configfile.getString("sat_TP_plc", "1");
sat_TP_plm = configfile.getInt32("sat_TP_plm", 0);
cableName = configfile.getString("cableName", cableName);
cable_TP_mod = configfile.getInt32("cable_TP_mod", QAM_64);
@@ -169,6 +172,7 @@ bool CScanSettings::loadSettings(const char * const fileName)
terrestrial_TP_hierarchy = configfile.getInt32("terrestrial_TP_hierarchy", HIERARCHY_AUTO);
terrestrial_TP_transmit_mode = configfile.getInt32("terrestrial_TP_transmit_mode", TRANSMISSION_MODE_AUTO);
terrestrial_TP_delsys = configfile.getInt32("terrestrial_TP_delsys", DVB_T);
terrestrial_TP_pli = configfile.getString("terrestrial_TP_pli", "0");
#if 1
if(sat_TP_fec == 4) sat_TP_fec = 5;
@@ -209,6 +213,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);
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);
@@ -227,6 +234,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);
configfile.setString("terrestrial_TP_pli", terrestrial_TP_pli);
if(configfile.getModifiedFlag())
configfile.saveConfig(fileName);