mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-12 07:53:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

add DVB-S2X support

Browse Source
This commit is contained in:
TangoCash
2017-12-04 09:46:04 +01:00
committed by Thilo Graf
parent 8ba4a58554
commit 4e65f22bdf
13 changed files with 142 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/system/locals.h
View File

@@ -563,6 +563,13 @@ typedef enum
LOCALE_EXTRA_TP_PILOT,
LOCALE_EXTRA_TP_PILOT_AUTO,
LOCALE_EXTRA_TP_PILOT_AUTO_SW,
LOCALE_EXTRA_TP_PLC,
LOCALE_EXTRA_TP_PLI,
LOCALE_EXTRA_TP_PLM,
LOCALE_EXTRA_TP_PLM_COMBO,
LOCALE_EXTRA_TP_PLM_GOLD,
LOCALE_EXTRA_TP_PLM_ROOT,
LOCALE_EXTRA_TP_PLM_UNK,
LOCALE_EXTRA_TP_POL,
LOCALE_EXTRA_TP_POL_H,
LOCALE_EXTRA_TP_POL_L,

7
src/system/locals_intern.h
View File

@@ -563,6 +563,13 @@ const char * locale_real_names[] =
"extra.tp_pilot",
"extra.tp_pilot_auto",
"extra.tp_pilot_auto_sw",
"extra.tp_plc",
"extra.tp_pli",
"extra.tp_plm",
"extra.tp_plm_combo",
"extra.tp_plm_gold",
"extra.tp_plm_root",
"extra.tp_plm_unk",
"extra.tp_pol",
"extra.tp_pol_h",
"extra.tp_pol_l",

8
src/system/settings.cpp
View File

@@ -146,6 +146,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);
@@ -164,6 +167,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;
@@ -204,6 +208,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);
@@ -222,6 +229,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);

4
src/system/settings.h
View File

@@ -1001,6 +1001,9 @@ class CScanSettings
int sat_TP_delsys;
int sat_TP_mod;
int sat_TP_pilot;
std::string sat_TP_pli;
std::string sat_TP_plc;
int sat_TP_plm;
std::string cableName;
int cable_TP_mod;
@@ -1019,6 +1022,7 @@ class CScanSettings
int terrestrial_TP_hierarchy;
int terrestrial_TP_transmit_mode;
int terrestrial_TP_delsys;
std::string terrestrial_TP_pli;
CScanSettings();