system/settings.cpp: split NIT flag for auto and manual, add mode flags

This commit is contained in:
[CST] Focus
2012-03-25 16:38:06 +04:00
parent 418b2b1898
commit 5382bb783a
2 changed files with 15 additions and 3 deletions

View File

@@ -151,7 +151,11 @@ bool CScanSettings::loadSettings(const char * const fileName, const delivery_sys
strcpy(satNameNoDiseqc, configfile.getString("satNameNoDiseqc", satNameNoDiseqc).c_str()); strcpy(satNameNoDiseqc, configfile.getString("satNameNoDiseqc", satNameNoDiseqc).c_str());
scan_fta_flag = configfile.getInt32("scan_fta_flag", 0); scan_fta_flag = configfile.getInt32("scan_fta_flag", 0);
scan_mode = configfile.getInt32("scan_mode", 1); // NIT (0) or fast (1) scan_nit = configfile.getInt32("scan_nit", 1);
scan_nit = configfile.getInt32("scan_nit_manual", 0);
scan_bat = configfile.getInt32("scan_bat", 0);
scan_bat = configfile.getInt32("scan_reset_numbers", 0);
scan_bat = configfile.getInt32("scan_logical_numbers", 0);
TP_fec = configfile.getInt32("TP_fec", 1); TP_fec = configfile.getInt32("TP_fec", 1);
TP_pol = configfile.getInt32("TP_pol", 0); TP_pol = configfile.getInt32("TP_pol", 0);
TP_mod = configfile.getInt32("TP_mod", 3); TP_mod = configfile.getInt32("TP_mod", 3);
@@ -178,7 +182,11 @@ bool CScanSettings::saveSettings(const char * const fileName)
configfile.setString( "satNameNoDiseqc", satNameNoDiseqc ); configfile.setString( "satNameNoDiseqc", satNameNoDiseqc );
configfile.setInt32("scan_fta_flag", scan_fta_flag); configfile.setInt32("scan_fta_flag", scan_fta_flag);
configfile.setInt32("scan_mode", scan_mode); configfile.setInt32("scan_nit", scan_nit);
configfile.setInt32("scan_nit_manual", scan_nit);
configfile.setInt32("scan_bat", scan_bat);
configfile.setInt32("scan_reset_numbers", scan_reset_numbers);
configfile.setInt32("scan_logical_numbers", scan_logical_numbers);
configfile.setInt32("TP_fec", TP_fec); configfile.setInt32("TP_fec", TP_fec);
configfile.setInt32("TP_pol", TP_pol); configfile.setInt32("TP_pol", TP_pol);
configfile.setInt32("TP_mod", TP_mod); configfile.setInt32("TP_mod", TP_mod);

View File

@@ -669,8 +669,12 @@ public:
char satNameNoDiseqc[50]; char satNameNoDiseqc[50];
delivery_system_t delivery_system; delivery_system_t delivery_system;
int scanSectionsd; int scanSectionsd;
int scan_mode; int scan_nit;
int scan_nit_manual;
int scan_bat;
int scan_fta_flag; int scan_fta_flag;
int scan_reset_numbers;
int scan_logical_numbers;
int TP_fec; int TP_fec;
int TP_pol; int TP_pol;
int TP_mod; int TP_mod;