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

6
src/gui/motorcontrol.cpp
View File

@@ -117,7 +117,7 @@ int CMotorControl::exec(CMenuTarget* parent, const std::string &)
CZapitClient::commandSetScanSatelliteList sat;
sat.position = CServiceManager::getInstance()->GetSatellitePosition(scansettings.satName);
strncpy(sat.satName, scansettings.satName, 49);
strncpy(sat.satName, scansettings.satName.c_str(), sizeof(sat.satName));
satList.push_back(sat);
satellite_map_t & satmap = frontend->getSatellites();
@@ -131,8 +131,8 @@ int CMotorControl::exec(CMenuTarget* parent, const std::string &)
g_Zapit->setScanSatelliteList(satList);
CZapit::getInstance()->SetLiveFrontend(frontend);
TP.feparams.dvb_feparams.frequency = atoi(scansettings.sat_TP_freq);
TP.feparams.dvb_feparams.u.qpsk.symbol_rate = atoi(scansettings.sat_TP_rate);
TP.feparams.dvb_feparams.frequency = atoi(scansettings.sat_TP_freq.c_str());
TP.feparams.dvb_feparams.u.qpsk.symbol_rate = atoi(scansettings.sat_TP_rate.c_str());
TP.feparams.dvb_feparams.u.qpsk.fec_inner = (fe_code_rate_t)scansettings.sat_TP_fec;
TP.polarization = scansettings.sat_TP_pol;