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

CScanSettings: convert char[...] configuration values to std::string

Browse Source
This commit is contained in:
M. Liebmann
2014-01-18 17:12:32 +01:00
parent 004aa84e32
commit 0a5a7b3146
7 changed files with 86 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/system/settings.cpp
View File

@@ -111,8 +111,8 @@ CScanSettings::CScanSettings(void)
delivery_system = DVB_S;
bouquetMode = CZapitClient::BM_UPDATEBOUQUETS;
scanType = CServiceScan::SCAN_TVRADIO;
strcpy(satName, "none");
strcpy(cableName, "none");
satName = "none";
cableName ="none";
}
bool CScanSettings::loadSettings(const char * const fileName, const delivery_system_t dsys)
@@ -138,17 +138,17 @@ bool CScanSettings::loadSettings(const char * const fileName, const delivery_sys
scan_logical_numbers = configfile.getInt32("scan_logical_numbers", 0);
scan_logical_hd = configfile.getInt32("scan_logical_hd", 1);
strcpy(satName, configfile.getString("satName", satName).c_str());
sat_TP_fec = configfile.getInt32("sat_TP_fec", 1);
sat_TP_pol = configfile.getInt32("sat_TP_pol", 0);
strcpy(sat_TP_freq, configfile.getString("sat_TP_freq", "10100000").c_str());
strcpy(sat_TP_rate, configfile.getString("sat_TP_rate", "27500000").c_str());
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_rate = configfile.getString("sat_TP_rate", "27500000");
strcpy(cableName, configfile.getString("cableName", cableName).c_str());
cable_TP_mod = configfile.getInt32("cable_TP_mod", 3);
cable_TP_fec = configfile.getInt32("cable_TP_fec", 1);
strcpy(cable_TP_freq, configfile.getString("cable_TP_freq", "369000").c_str());
strcpy(cable_TP_rate, configfile.getString("cable_TP_rate", "6875000").c_str());
cableName = configfile.getString("cableName", cableName);
cable_TP_mod = configfile.getInt32("cable_TP_mod", 3);
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");
#if 1
if(sat_TP_fec == 4) sat_TP_fec = 5;
#endif