mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 23:42:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a5a7b3146
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2014-01-18 17:12:32 +01:00
parent 9cf6b04250
commit a46c558669
7 changed files with 86 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/scan.cpp
View File

@@ -148,7 +148,7 @@ void CScanTs::testFunc()
snprintf(buffer,sizeof(buffer), "%u %d %s %s %s", TP.feparams.dvb_feparams.frequency/1000, TP.feparams.dvb_feparams.u.qam.symbol_rate/1000, f, s, m);
}
printf("CScanTs::testFunc: %s\n", buffer);
paintLine(xpos2, ypos_cur_satellite, w - 95, pname);
paintLine(xpos2, ypos_cur_satellite, w - 95, pname.c_str());
paintLine(xpos2, ypos_frequency, w, buffer);
success = g_Zapit->tune_TP(TP);
}
@@ -217,13 +217,13 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
scan_flags |= CServiceScan::SCAN_NIT;
TP.scan_mode = scan_flags;
if (deltype == FE_QPSK) {
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;
} else {
TP.feparams.dvb_feparams.frequency = atoi(scansettings.cable_TP_freq);
TP.feparams.dvb_feparams.u.qam.symbol_rate = atoi(scansettings.cable_TP_rate);
TP.feparams.dvb_feparams.frequency = atoi(scansettings.cable_TP_freq.c_str());
TP.feparams.dvb_feparams.u.qam.symbol_rate = atoi(scansettings.cable_TP_rate.c_str());
TP.feparams.dvb_feparams.u.qam.fec_inner = (fe_code_rate_t)scansettings.cable_TP_fec;
TP.feparams.dvb_feparams.u.qam.modulation = (fe_modulation_t) scansettings.cable_TP_mod;
}
@@ -243,7 +243,7 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
}
else if(manual || !scan_all) {
sat.position = CServiceManager::getInstance()->GetSatellitePosition(pname);
strncpy(sat.satName, pname, 49);
strncpy(sat.satName, pname.c_str(), 49);
satList.push_back(sat);
} else {
satellite_map_t & satmap = CServiceManager::getInstance()->SatelliteList();