mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 09:51:22 +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

97
src/system/locals.h
View File

@@ -399,25 +399,11 @@ typedef enum
LOCALE_EXTRA_FEC_5_6,
LOCALE_EXTRA_FEC_7_8,
LOCALE_EXTRA_FEC_AUTO,
LOCALE_EXTRA_FEC_AUTO_S2,
LOCALE_EXTRA_FEC_S2_8PSK_1_2,
LOCALE_EXTRA_FEC_S2_8PSK_2_3,
LOCALE_EXTRA_FEC_S2_8PSK_3_4,
LOCALE_EXTRA_FEC_S2_8PSK_3_5,
LOCALE_EXTRA_FEC_S2_8PSK_4_5,
LOCALE_EXTRA_FEC_S2_8PSK_5_6,
LOCALE_EXTRA_FEC_S2_8PSK_7_8,
LOCALE_EXTRA_FEC_S2_8PSK_8_9,
LOCALE_EXTRA_FEC_S2_8PSK_9_10,
LOCALE_EXTRA_FEC_S2_QPSK_1_2,
LOCALE_EXTRA_FEC_S2_QPSK_2_3,
LOCALE_EXTRA_FEC_S2_QPSK_3_4,
LOCALE_EXTRA_FEC_S2_QPSK_3_5,
LOCALE_EXTRA_FEC_S2_QPSK_4_5,
LOCALE_EXTRA_FEC_S2_QPSK_5_6,
LOCALE_EXTRA_FEC_S2_QPSK_7_8,
LOCALE_EXTRA_FEC_S2_QPSK_8_9,
LOCALE_EXTRA_FEC_S2_QPSK_9_10,
LOCALE_EXTRA_FEC_2_5,
LOCALE_EXTRA_FEC_3_5,
LOCALE_EXTRA_FEC_4_5,
LOCALE_EXTRA_FEC_8_9,
LOCALE_EXTRA_FEC_9_10,
LOCALE_EXTRA_KEY_CURRENT_TRANSPONDER,
LOCALE_EXTRA_KEY_FORMAT_MODE,
LOCALE_EXTRA_KEY_LIST_END,
@@ -454,20 +440,76 @@ typedef enum
LOCALE_EXTRA_START_TOSTANDBY,
LOCALE_EXTRA_TEMP_TIMESHIFT,
LOCALE_EXTRA_TIMESHIFT_PAUSE,
LOCALE_EXTRA_TP_POL_V,
LOCALE_EXTRA_TP_BANDWIDTH,
LOCALE_EXTRA_TP_BANDWIDTH_8MHZ,
LOCALE_EXTRA_TP_BANDWIDTH_7MHZ,
LOCALE_EXTRA_TP_BANDWIDTH_6MHZ,
LOCALE_EXTRA_TP_BANDWIDTH_5MHZ,
LOCALE_EXTRA_TP_BANDWIDTH_10MHZ,
LOCALE_EXTRA_TP_BANDWIDTH_1_712MHZ,
LOCALE_EXTRA_TP_BANDWIDTH_AUTO,
LOCALE_EXTRA_TP_CODERATE_HP,
LOCALE_EXTRA_TP_CODERATE_LP,
LOCALE_EXTRA_TP_CONSTELLATION,
LOCALE_EXTRA_TP_DELSYS,
LOCALE_EXTRA_TP_DELSYS_DVBC,
LOCALE_EXTRA_TP_DELSYS_DVBC2,
LOCALE_EXTRA_TP_DELSYS_DVBS,
LOCALE_EXTRA_TP_DELSYS_DVBS2,
LOCALE_EXTRA_TP_DELSYS_DVBT,
LOCALE_EXTRA_TP_DELSYS_DVBT2,
LOCALE_EXTRA_TP_DELSYS_DTMB,
LOCALE_EXTRA_TP_DELSYS_DSS,
LOCALE_EXTRA_TP_DELSYS_TURBO,
LOCALE_EXTRA_TP_DELSYS_ISDBS,
LOCALE_EXTRA_TP_DELSYS_ISDBC,
LOCALE_EXTRA_TP_DELSYS_ISDBT,
LOCALE_EXTRA_TP_FEC,
LOCALE_EXTRA_TP_FREQ,
LOCALE_EXTRA_TP_GI,
LOCALE_EXTRA_TP_GI_1_32,
LOCALE_EXTRA_TP_GI_1_16,
LOCALE_EXTRA_TP_GI_1_8,
LOCALE_EXTRA_TP_GI_1_4,
LOCALE_EXTRA_TP_GI_1_128,
LOCALE_EXTRA_TP_GI_19_128,
LOCALE_EXTRA_TP_GI_19_256,
LOCALE_EXTRA_TP_GI_PN420,
LOCALE_EXTRA_TP_GI_PN595,
LOCALE_EXTRA_TP_GI_PN945,
LOCALE_EXTRA_TP_GI_AUTO,
LOCALE_EXTRA_TP_HIERARCHY,
LOCALE_EXTRA_TP_HIERARCHY_NONE,
LOCALE_EXTRA_TP_HIERARCHY_1,
LOCALE_EXTRA_TP_HIERARCHY_2,
LOCALE_EXTRA_TP_HIERARCHY_4,
LOCALE_EXTRA_TP_HIERARCHY_AUTO,
LOCALE_EXTRA_TP_MOD,
LOCALE_EXTRA_TP_MOD_128,
LOCALE_EXTRA_TP_MOD_4,
LOCALE_EXTRA_TP_MOD_8,
LOCALE_EXTRA_TP_MOD_16,
LOCALE_EXTRA_TP_MOD_256,
LOCALE_EXTRA_TP_MOD_32,
LOCALE_EXTRA_TP_MOD_64,
LOCALE_EXTRA_TP_MOD_128,
LOCALE_EXTRA_TP_MOD_256,
LOCALE_EXTRA_TP_MOD_AUTO,
LOCALE_EXTRA_TP_MOD_4_NR,
LOCALE_EXTRA_TP_POL,
LOCALE_EXTRA_TP_POL_H,
LOCALE_EXTRA_TP_POL_L,
LOCALE_EXTRA_TP_POL_R,
LOCALE_EXTRA_TP_POL_V,
LOCALE_EXTRA_TP_RATE,
LOCALE_EXTRA_TP_TRANSMIT_MODE,
LOCALE_EXTRA_TP_TRANSMIT_MODE_1K,
LOCALE_EXTRA_TP_TRANSMIT_MODE_2K,
LOCALE_EXTRA_TP_TRANSMIT_MODE_4K,
LOCALE_EXTRA_TP_TRANSMIT_MODE_8K,
LOCALE_EXTRA_TP_TRANSMIT_MODE_16K,
LOCALE_EXTRA_TP_TRANSMIT_MODE_32K,
LOCALE_EXTRA_TP_TRANSMIT_MODE_C1,
LOCALE_EXTRA_TP_TRANSMIT_MODE_C3780,
LOCALE_EXTRA_TP_TRANSMIT_MODE_AUTO,
LOCALE_EXTRA_UPDATE_DIR,
LOCALE_EXTRA_USE_GOTOXX,
LOCALE_EXTRA_VOLUME_DIGITS,
@@ -1146,9 +1188,11 @@ typedef enum
LOCALE_MENU_HINT_SCAN_AUTOALL,
LOCALE_MENU_HINT_SCAN_AUTOALL_SELECT,
LOCALE_MENU_HINT_SCAN_BOUQUET,
LOCALE_MENU_HINT_SCAN_BW,
LOCALE_MENU_HINT_SCAN_CABLE,
LOCALE_MENU_HINT_SCAN_CABLE_SIMPLE,
LOCALE_MENU_HINT_SCAN_COMMITED,
LOCALE_MENU_HINT_SCAN_DELSYS,
LOCALE_MENU_HINT_SCAN_DISEQC,
LOCALE_MENU_HINT_SCAN_DISEQCORDER,
LOCALE_MENU_HINT_SCAN_DISEQCREPEAT,
@@ -1164,6 +1208,8 @@ typedef enum
LOCALE_MENU_HINT_SCAN_FESETUP,
LOCALE_MENU_HINT_SCAN_FETIMEOUT,
LOCALE_MENU_HINT_SCAN_FREQ,
LOCALE_MENU_HINT_SCAN_GI,
LOCALE_MENU_HINT_SCAN_HIERARCHY,
LOCALE_MENU_HINT_SCAN_FTA,
LOCALE_MENU_HINT_SCAN_LADIRECTION,
LOCALE_MENU_HINT_SCAN_LATITUDE,
@@ -1201,6 +1247,7 @@ typedef enum
LOCALE_MENU_HINT_SCAN_START,
LOCALE_MENU_HINT_SCAN_TEST,
LOCALE_MENU_HINT_SCAN_TPSELECT,
LOCALE_MENU_HINT_SCAN_TRANSMIT_MODE,
LOCALE_MENU_HINT_SCAN_UNCOMMITED,
LOCALE_MENU_HINT_SCAN_USALS,
LOCALE_MENU_HINT_SCAN_USALS_REPEAT,
@@ -1860,6 +1907,11 @@ typedef enum
LOCALE_SATSETUP_FASTSCAN_SD,
LOCALE_SATSETUP_FASTSCAN_TYPE,
LOCALE_SATSETUP_FASTSCAN_UPDATE,
LOCALE_SATSETUP_FE_DELSYS_MODE,
LOCALE_SATSETUP_FE_DELSYS_MODE_AUTO,
LOCALE_SATSETUP_FE_DELSYS_MODE_CABLE,
LOCALE_SATSETUP_FE_DELSYS_MODE_SAT,
LOCALE_SATSETUP_FE_DELSYS_MODE_TERRESTRIAL,
LOCALE_SATSETUP_FE_MODE,
LOCALE_SATSETUP_FE_MODE_INDEPENDENT,
LOCALE_SATSETUP_FE_MODE_LINK_LOOP,
@@ -1900,6 +1952,7 @@ typedef enum
LOCALE_SCANTS_ABORT_BODY,
LOCALE_SCANTS_ABORT_HEADER,
LOCALE_SCANTS_ACTCABLE,
LOCALE_SCANTS_ACTHYBRID,
LOCALE_SCANTS_ACTSATELLITE,
LOCALE_SCANTS_ACTTERRESTRIAL,
LOCALE_SCANTS_BOUQUET,

97
src/system/locals_intern.h
View File

@@ -399,25 +399,11 @@ const char * locale_real_names[] =
"extra.fec_5_6",
"extra.fec_7_8",
"extra.fec_auto",
"extra.fec_auto_s2",
"extra.fec_s2_8psk_1_2",
"extra.fec_s2_8psk_2_3",
"extra.fec_s2_8psk_3_4",
"extra.fec_s2_8psk_3_5",
"extra.fec_s2_8psk_4_5",
"extra.fec_s2_8psk_5_6",
"extra.fec_s2_8psk_7_8",
"extra.fec_s2_8psk_8_9",
"extra.fec_s2_8psk_9_10",
"extra.fec_s2_qpsk_1_2",
"extra.fec_s2_qpsk_2_3",
"extra.fec_s2_qpsk_3_4",
"extra.fec_s2_qpsk_3_5",
"extra.fec_s2_qpsk_4_5",
"extra.fec_s2_qpsk_5_6",
"extra.fec_s2_qpsk_7_8",
"extra.fec_s2_qpsk_8_9",
"extra.fec_s2_qpsk_9_10",
"extra.fec_2_5",
"extra.fec_3_5",
"extra.fec_4_5",
"extra.fec_8_9",
"extra.fec_9_10",
"extra.key_current_transponder",
"extra.key_format_mode",
"extra.key_list_end",
@@ -454,20 +440,76 @@ const char * locale_real_names[] =
"extra.start_tostandby",
"extra.temp_timeshift",
"extra.timeshift_pause",
"extra.tp.pol_v",
"extra.tp_bandwidth",
"extra.tp_bandwidth_8mhz",
"extra.tp_bandwidth_7mhz",
"extra.tp_bandwidth_6mhz",
"extra.tp_bandwidth_5mhz",
"extra.tp_bandwidth_10mhz",
"extra.tp_bandwidth_1_712mhz",
"extra.tp_bandwidth_auto",
"extra.tp_coderate_hp",
"extra.tp_coderate_lp",
"extra.tp_constellation",
"extra.tp_delsys",
"extra.tp_delsys_dvbc",
"extra.tp_delsys_dvbc2",
"extra.tp_delsys_dvbs",
"extra.tp_delsys_dvbs2",
"extra.tp_delsys_dvbt",
"extra.tp_delsys_dvbt2",
"extra.tp_delsys_dtmb",
"extra.tp_delsys_dss",
"extra.tp_delsys_turbo",
"extra.tp_delsys_isdbs",
"extra.tp_delsys_isdbc",
"extra.tp_delsys_isdbt",
"extra.tp_fec",
"extra.tp_freq",
"extra.tp_gi",
"extra.tp_gi_auto",
"extra.tp_gi_1_32",
"extra.tp_gi_1_16",
"extra.tp_gi_1_8",
"extra.tp_gi_1_4",
"extra.tp_gi_1_128",
"extra.tp_gi_19_128",
"extra.tp_gi_19_256",
"extra.tp_gi_pn420",
"extra.tp_gi_pn595",
"extra.tp_gi_pn945",
"extra.tp_hierarchy",
"extra.tp_hierarchy_none",
"extra.tp_hierarchy_1",
"extra.tp_hierarchy_2",
"extra.tp_hierarchy_4",
"extra.tp_hierarchy_auto",
"extra.tp_mod",
"extra.tp_mod_128",
"extra.tp_mod_4",
"extra.tp_mod_8",
"extra.tp_mod_16",
"extra.tp_mod_256",
"extra.tp_mod_32",
"extra.tp_mod_64",
"extra.tp_mod_128",
"extra.tp_mod_256",
"extra.tp_mod_auto",
"extra.tp_mod_4_nr",
"extra.tp_pol",
"extra.tp_pol_h",
"extra.tp_pol_l",
"extra.tp_pol_r",
"extra.tp_pol_v",
"extra.tp_rate",
"extra.tp_transmit_mode",
"extra.tp_transmit_mode_2k",
"extra.tp_transmit_mode_4k",
"extra.tp_transmit_mode_8k",
"extra.tp_transmit_mode_1k",
"extra.tp_transmit_mode_16k",
"extra.tp_transmit_mode_32k",
"extra.tp_transmit_mode_c1",
"extra.tp_transmit_mode_c3780",
"extra.tp_transmit_mode_auto",
"extra.update_dir",
"extra.use_gotoxx",
"extra.volume_digits",
@@ -1146,9 +1188,11 @@ const char * locale_real_names[] =
"menu.hint_scan_autoall",
"menu.hint_scan_autoall_select",
"menu.hint_scan_bouquet",
"menu.hint_scan_bw",
"menu.hint_scan_cable",
"menu.hint_scan_cable_simple",
"menu.hint_scan_commited",
"menu.hint_scan_delsys",
"menu.hint_scan_diseqc",
"menu.hint_scan_diseqcorder",
"menu.hint_scan_diseqcrepeat",
@@ -1165,6 +1209,8 @@ const char * locale_real_names[] =
"menu.hint_scan_fetimeout",
"menu.hint_scan_freq",
"menu.hint_scan_fta",
"menu.hint_scan_gi",
"menu.hint_scan_hierarchy",
"menu.hint_scan_ladirection",
"menu.hint_scan_latitude",
"menu.hint_scan_lnbconfig",
@@ -1201,6 +1247,7 @@ const char * locale_real_names[] =
"menu.hint_scan_start",
"menu.hint_scan_test",
"menu.hint_scan_tpselect",
"menu.hint_scan_transmit_mode",
"menu.hint_scan_uncommited",
"menu.hint_scan_usals",
"menu.hint_scan_usals_repeat",
@@ -1860,6 +1907,11 @@ const char * locale_real_names[] =
"satsetup.fastscan_sd",
"satsetup.fastscan_type",
"satsetup.fastscan_update",
"satsetup.fe_delsys_mode",
"satsetup.fe_delsys_mode_auto",
"satsetup.fe_delsys_mode_cable",
"satsetup.fe_delsys_mode_sat",
"satsetup.fe_delsys_mode_terrestrial",
"satsetup.fe_mode",
"satsetup.fe_mode_independent",
"satsetup.fe_mode_link_loop",
@@ -1900,6 +1952,7 @@ const char * locale_real_names[] =
"scants.abort_body",
"scants.abort_header",
"scants.actcable",
"scants.acthybrid",
"scants.actsatellite",
"scants.actterrestrial",
"scants.bouquet",

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);

16
src/system/settings.h
View File

@@ -798,15 +798,27 @@ class CScanSettings
int sat_TP_pol;
std::string sat_TP_freq;
std::string sat_TP_rate;
int sat_TP_delsys;
int sat_TP_mod;
std::string cableName;
int cable_TP_mod;
int cable_TP_fec;
std::string cable_TP_freq;
std::string cable_TP_rate;
int cable_TP_delsys;
std::string terrestrialName;
std::string terrestrial_TP_freq;
int terrestrial_TP_constel;
int terrestrial_TP_bw;
int terrestrial_TP_coderate_HP;
int terrestrial_TP_coderate_LP;
int terrestrial_TP_guard;
int terrestrial_TP_hierarchy;
int terrestrial_TP_transmit_mode;
int terrestrial_TP_delsys;
std::string terrName;
std::string terr_TP_freq;
CScanSettings();
bool loadSettings(const char * const fileName);