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

split fec to fec/modulation/delivery system;

Browse Source 
switch to new dvb-api headers;
improve dvb-t manual scan
This commit is contained in:
[CST] Bas
2014-08-08 13:39:06 +04:00
committed by [CST] Focus
parent 06bda609cf
commit 17d1bbd12b
44 changed files with 2652 additions and 1203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/system/settings.cpp
View File

@@ -141,17 +141,33 @@ bool CScanSettings::loadSettings(const char * const fileName)
satName = configfile.getString("satName", satName);
sat_TP_fec = configfile.getInt32("sat_TP_fec", 1);
sat_TP_pol = configfile.getInt32("sat_TP_pol", 0);
sat_TP_freq = configfile.getString("sat_TP_freq", "10100000");
sat_TP_freq = configfile.getString("sat_TP_freq", "10700000");
sat_TP_rate = configfile.getString("sat_TP_rate", "27500000");
sat_TP_mod = configfile.getInt32("sat_TP_mod", QPSK);
sat_TP_delsys = configfile.getInt32("sat_TP_delsys", DVB_S);
cableName = configfile.getString("cableName", cableName);
cable_TP_mod = configfile.getInt32("cable_TP_mod", 3);
cable_TP_mod = configfile.getInt32("cable_TP_mod", QAM_64);
cable_TP_fec = configfile.getInt32("cable_TP_fec", 1);
cable_TP_freq = configfile.getString("cable_TP_freq", "369000");
cable_TP_rate = configfile.getString("cable_TP_rate", "6875000");
cable_TP_delsys = configfile.getInt32("cable_TP_delsys", DVB_C);
terrestrialName = configfile.getString("terrestrialName", terrestrialName);
terrestrial_TP_constel = configfile.getInt32("terrestrial_TP_constel", QAM_AUTO);
terrestrial_TP_bw = configfile.getInt32("terrestrial_TP_bw", BANDWIDTH_AUTO);
terrestrial_TP_coderate_HP = configfile.getInt32("terrestrial_TP_coderate_HP", FEC_AUTO);
terrestrial_TP_coderate_LP = configfile.getInt32("terrestrial_TP_coderate_LP", FEC_AUTO);
terrestrial_TP_freq = configfile.getString("terrestrial_TP_freq", "369000");
terrestrial_TP_guard = configfile.getInt32("terrestrial_TP_guard", GUARD_INTERVAL_AUTO);
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);
#if 1
if(sat_TP_fec == 4) sat_TP_fec = 5;
#endif
fast_type = configfile.getInt32("fast_type", 2);
fast_op = configfile.getInt32("fast_op", 0);
fst_version = configfile.getInt32("fst_version", 0);
@@ -184,12 +200,26 @@ bool CScanSettings::saveSettings(const char * const fileName)
configfile.setInt32("sat_TP_pol", sat_TP_pol);
configfile.setString("sat_TP_freq", sat_TP_freq);
configfile.setString("sat_TP_rate", sat_TP_rate);
configfile.setInt32("sat_TP_delsys", sat_TP_delsys);
configfile.setInt32("sat_TP_mod", sat_TP_mod);
configfile.setString("cableName", cableName);
configfile.setInt32("cable_TP_fec", cable_TP_fec);
configfile.setInt32("cable_TP_mod", cable_TP_mod);
configfile.setString("cable_TP_freq", cable_TP_freq);
configfile.setString("cable_TP_rate", cable_TP_rate);
configfile.setInt32("cable_TP_delsys", cable_TP_delsys);
configfile.setString("terrestrialName", terrestrialName);
configfile.setInt32("terrestrial_TP_constel", terrestrial_TP_constel);
configfile.setInt32("terrestrial_TP_bw", terrestrial_TP_bw);
configfile.setInt32("terrestrial_TP_coderate_HP", terrestrial_TP_coderate_HP);
configfile.setInt32("terrestrial_TP_coderate_LP", terrestrial_TP_coderate_LP);
configfile.setString("terrestrial_TP_freq", terrestrial_TP_freq);
configfile.setInt32("terrestrial_TP_hierarchy", terrestrial_TP_hierarchy);
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(configfile.getModifiedFlag())
configfile.saveConfig(fileName);