diff --git a/src/system/settings.cpp b/src/system/settings.cpp index 098c47c80..789de117f 100644 --- a/src/system/settings.cpp +++ b/src/system/settings.cpp @@ -116,25 +116,16 @@ const struct personalize_settings_t personalize_settings[SNeutrinoSettings::P_SE CScanSettings::CScanSettings(void) : configfile('\t') { - delivery_system = DVB_S; bouquetMode = CZapitClient::BM_UPDATEBOUQUETS; scanType = CServiceScan::SCAN_TVRADIO; satName = "none"; cableName ="none"; } -bool CScanSettings::loadSettings(const char * const fileName, const delivery_system_t dsys) +bool CScanSettings::loadSettings(const char * const fileName) { bool ret = configfile.loadConfig(fileName); - if (configfile.getInt32("delivery_system", -1) != dsys) - { - // configfile is not for this delivery system - configfile.clear(); - ret = false; - } - delivery_system = dsys; - bouquetMode = (CZapitClient::bouquetMode) configfile.getInt32("bouquetMode" , bouquetMode); scanType = (CZapitClient::scanType) configfile.getInt32("scanType", scanType); @@ -162,6 +153,7 @@ bool CScanSettings::loadSettings(const char * const fileName, const delivery_sys #endif fast_type = configfile.getInt32("fast_type", 2); fast_op = configfile.getInt32("fast_op", 0); + fst_version = configfile.getInt32("fst_version", 0); cable_nid = configfile.getInt32("cable_nid", 0); return ret; @@ -169,7 +161,6 @@ bool CScanSettings::loadSettings(const char * const fileName, const delivery_sys bool CScanSettings::saveSettings(const char * const fileName) { - configfile.setInt32("delivery_system", delivery_system); configfile.setInt32("bouquetMode", bouquetMode); configfile.setInt32("scanType", scanType); @@ -182,6 +173,7 @@ bool CScanSettings::saveSettings(const char * const fileName) configfile.setInt32("scan_logical_hd", scan_logical_hd); configfile.setInt32("fast_type", fast_type); configfile.setInt32("fast_op", fast_op); + configfile.setInt32("fst_version", fst_version); configfile.setInt32("cable_nid", cable_nid); configfile.setString("satName", satName); diff --git a/src/system/settings.h b/src/system/settings.h index d30cffe0d..ef7cf8434 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -773,7 +773,6 @@ class CScanSettings int bouquetMode; int scanType; - delivery_system_t delivery_system; int scan_nit; int scan_nit_manual; int scan_bat; @@ -783,6 +782,7 @@ class CScanSettings int scan_logical_hd; int fast_type; int fast_op; + int fst_version; int cable_nid; std::string satName; @@ -801,8 +801,7 @@ class CScanSettings std::string terr_TP_freq; CScanSettings(); - //void useDefaults(const delivery_system_t _delivery_system); - bool loadSettings(const char * const fileName, const delivery_system_t _delivery_system); + bool loadSettings(const char * const fileName); bool saveSettings(const char * const fileName); };