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

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

Browse Source 
Origin commit data
------------------
Commit: 0a5a7b3146
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)
This commit is contained in:
Michael Liebmann
2014-01-18 17:12:32 +01:00
parent 3e96126769
commit c7fb87a9a3
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; CZapitClient::commandSetScanSatelliteList sat;
sat.position = CServiceManager::getInstance()->GetSatellitePosition(scansettings.satName); 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); satList.push_back(sat);
satellite_map_t & satmap = frontend->getSatellites(); satellite_map_t & satmap = frontend->getSatellites();
@@ -131,8 +131,8 @@ int CMotorControl::exec(CMenuTarget* parent, const std::string &)
g_Zapit->setScanSatelliteList(satList); g_Zapit->setScanSatelliteList(satList);
CZapit::getInstance()->SetLiveFrontend(frontend); CZapit::getInstance()->SetLiveFrontend(frontend);
TP.feparams.dvb_feparams.frequency = atoi(scansettings.sat_TP_freq); 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); 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.feparams.dvb_feparams.u.qpsk.fec_inner = (fe_code_rate_t)scansettings.sat_TP_fec;
TP.polarization = scansettings.sat_TP_pol; TP.polarization = scansettings.sat_TP_pol;

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); 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); 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); paintLine(xpos2, ypos_frequency, w, buffer);
success = g_Zapit->tune_TP(TP); success = g_Zapit->tune_TP(TP);
} }
@@ -217,13 +217,13 @@ int CScanTs::exec(CMenuTarget* /*parent*/, const std::string & actionKey)
scan_flags |= CServiceScan::SCAN_NIT; scan_flags |= CServiceScan::SCAN_NIT;
TP.scan_mode = scan_flags; TP.scan_mode = scan_flags;
if (deltype == FE_QPSK) { if (deltype == FE_QPSK) {
TP.feparams.dvb_feparams.frequency = atoi(scansettings.sat_TP_freq); 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); 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.feparams.dvb_feparams.u.qpsk.fec_inner = (fe_code_rate_t) scansettings.sat_TP_fec;
TP.polarization = scansettings.sat_TP_pol; TP.polarization = scansettings.sat_TP_pol;
} else { } else {
TP.feparams.dvb_feparams.frequency = atoi(scansettings.cable_TP_freq); 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); 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.fec_inner = (fe_code_rate_t)scansettings.cable_TP_fec;
TP.feparams.dvb_feparams.u.qam.modulation = (fe_modulation_t) scansettings.cable_TP_mod; 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) { else if(manual || !scan_all) {
sat.position = CServiceManager::getInstance()->GetSatellitePosition(pname); sat.position = CServiceManager::getInstance()->GetSatellitePosition(pname);
strncpy(sat.satName, pname, 49); strncpy(sat.satName, pname.c_str(), 49);
satList.push_back(sat); satList.push_back(sat);
} else { } else {
satellite_map_t & satmap = CServiceManager::getInstance()->SatelliteList(); satellite_map_t & satmap = CServiceManager::getInstance()->SatelliteList();

2
src/gui/scan.h
View File

@@ -80,7 +80,7 @@ class CScanTs : public CMenuTarget
void prev_next_TP(bool); void prev_next_TP(bool);
TP_params TP; TP_params TP;
int deltype; int deltype;
char * pname; std::string pname;
public: public:
CScanTs(int dtype = FE_QPSK); CScanTs(int dtype = FE_QPSK);

81
src/gui/scan_setup.cpp
View File

@@ -569,16 +569,21 @@ int CScanSetup::showScanMenuFrontendSetup()
nc->setHint("", LOCALE_MENU_HINT_SCAN_FETIMEOUT); nc->setHint("", LOCALE_MENU_HINT_SCAN_FETIMEOUT);
setupMenu->addItem(nc); setupMenu->addItem(nc);
std::string zapit_lat_str;
std::string zapit_long_str;
if (CFEManager::getInstance()->haveSat()) { if (CFEManager::getInstance()->haveSat()) {
sprintf(zapit_lat, "%02.6f", zapitCfg.gotoXXLatitude); sprintf(zapit_lat, "%02.6f", zapitCfg.gotoXXLatitude);
sprintf(zapit_long, "%02.6f", zapitCfg.gotoXXLongitude); sprintf(zapit_long, "%02.6f", zapitCfg.gotoXXLongitude);
zapit_lat_str = std::string(zapit_lat);
zapit_long_str = std::string(zapit_long);
setupMenu->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_SATSETUP_EXTENDED_MOTOR)); setupMenu->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_SATSETUP_EXTENDED_MOTOR));
CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_EXTRA_LADIRECTION, (int *)&zapitCfg.gotoXXLaDirection, OPTIONS_SOUTH0_NORTH1_OPTIONS, OPTIONS_SOUTH0_NORTH1_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++)); CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_EXTRA_LADIRECTION, (int *)&zapitCfg.gotoXXLaDirection, OPTIONS_SOUTH0_NORTH1_OPTIONS, OPTIONS_SOUTH0_NORTH1_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++));
mc->setHint("", LOCALE_MENU_HINT_SCAN_LADIRECTION); mc->setHint("", LOCALE_MENU_HINT_SCAN_LADIRECTION);
setupMenu->addItem(mc); setupMenu->addItem(mc);
CStringInput * toff1 = new CStringInput(LOCALE_EXTRA_LATITUDE, (char *) zapit_lat, 10, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789."); CStringInput * toff1 = new CStringInput(LOCALE_EXTRA_LATITUDE, &zapit_lat_str, 10, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789.");
mf = new CMenuDForwarder(LOCALE_EXTRA_LATITUDE, true, zapit_lat, toff1, "", CRCInput::convertDigitToKey(shortcut++)); mf = new CMenuDForwarder(LOCALE_EXTRA_LATITUDE, true, zapit_lat, toff1, "", CRCInput::convertDigitToKey(shortcut++));
mf->setHint("", LOCALE_MENU_HINT_SCAN_LATITUDE); mf->setHint("", LOCALE_MENU_HINT_SCAN_LATITUDE);
setupMenu->addItem(mf); setupMenu->addItem(mf);
@@ -587,7 +592,7 @@ int CScanSetup::showScanMenuFrontendSetup()
mc->setHint("", LOCALE_MENU_HINT_SCAN_LODIRECTION); mc->setHint("", LOCALE_MENU_HINT_SCAN_LODIRECTION);
setupMenu->addItem(mc); setupMenu->addItem(mc);
CStringInput * toff2 = new CStringInput(LOCALE_EXTRA_LONGITUDE, (char *) zapit_long, 10, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789."); CStringInput * toff2 = new CStringInput(LOCALE_EXTRA_LONGITUDE, &zapit_long_str, 10, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789.");
mf = new CMenuDForwarder(LOCALE_EXTRA_LONGITUDE, true, zapit_long, toff2, "", CRCInput::convertDigitToKey(shortcut++)); mf = new CMenuDForwarder(LOCALE_EXTRA_LONGITUDE, true, zapit_long, toff2, "", CRCInput::convertDigitToKey(shortcut++));
mf->setHint("", LOCALE_MENU_HINT_SCAN_LONGITUDE); mf->setHint("", LOCALE_MENU_HINT_SCAN_LONGITUDE);
setupMenu->addItem(mf); setupMenu->addItem(mf);
@@ -598,6 +603,10 @@ int CScanSetup::showScanMenuFrontendSetup()
} }
int res = setupMenu->exec(NULL, ""); int res = setupMenu->exec(NULL, "");
strncpy(zapit_lat, zapit_lat_str.c_str(), sizeof(zapit_lat));
strncpy(zapit_long, zapit_long_str.c_str(), sizeof(zapit_long));
delete setupMenu; delete setupMenu;
if (fe_restart) { if (fe_restart) {
fe_restart = false; fe_restart = false;
@@ -893,7 +902,7 @@ void CScanSetup::fillSatSelect(CMenuOptionStringChooser * select)
select->addOption(satname.c_str()); select->addOption(satname.c_str());
satpos.insert(sit->first); satpos.insert(sit->first);
if (!sfound && strcmp(scansettings.satName, satname.c_str()) == 0) if (!sfound && (scansettings.satName == satname))
sfound = true; sfound = true;
} }
} }
@@ -901,7 +910,7 @@ void CScanSetup::fillSatSelect(CMenuOptionStringChooser * select)
if(!sfound && !satpos.empty()) { if(!sfound && !satpos.empty()) {
tmpit = satpos.begin(); tmpit = satpos.begin();
std::string satname = CServiceManager::getInstance()->GetSatelliteName(*tmpit); std::string satname = CServiceManager::getInstance()->GetSatelliteName(*tmpit);
snprintf(scansettings.satName, sizeof(scansettings.satName), "%s", satname.c_str()); scansettings.satName = satname;
} }
satellite_map_t & satmap = CServiceManager::getInstance()->SatelliteList(); satellite_map_t & satmap = CServiceManager::getInstance()->SatelliteList();
for (sat_iterator_t sit = satmap.begin(); sit != satmap.end(); sit++) { for (sat_iterator_t sit = satmap.begin(); sit != satmap.end(); sit++) {
@@ -933,13 +942,13 @@ void CScanSetup::fillCableSelect(CMenuOptionStringChooser * select)
if (fname.empty()) if (fname.empty())
fname = sit->second.name; fname = sit->second.name;
if (!sfound && strcmp(scansettings.cableName, sit->second.name.c_str()) == 0) if (!sfound && (scansettings.cableName == sit->second.name))
sfound = true; sfound = true;
dprintf(DEBUG_DEBUG, "got scanprovider (cable): %s\n", sit->second.name.c_str()); dprintf(DEBUG_DEBUG, "got scanprovider (cable): %s\n", sit->second.name.c_str());
} }
if (!sfound && !fname.empty()) if (!sfound && !fname.empty())
snprintf(scansettings.cableName, sizeof(scansettings.cableName), "%s", fname.c_str()); scansettings.cableName = fname;
} }
int CScanSetup::showScanMenuSatFind() int CScanSetup::showScanMenuSatFind()
@@ -958,7 +967,7 @@ int CScanSetup::showScanMenuSatFind()
sat_findMenu->setSelected(selected); sat_findMenu->setSelected(selected);
sat_findMenu->addIntroItems(); sat_findMenu->addIntroItems();
CMenuOptionStringChooser * feSatSelect = new CMenuOptionStringChooser(LOCALE_SATSETUP_SATELLITE, scansettings.satName, true, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED, true); CMenuOptionStringChooser * feSatSelect = new CMenuOptionStringChooser(LOCALE_SATSETUP_SATELLITE, &scansettings.satName, true, NULL, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED, true);
feSatSelect->setHint("", LOCALE_MENU_HINT_SCAN_SATSELECT); feSatSelect->setHint("", LOCALE_MENU_HINT_SCAN_SATSELECT);
satellite_map_t & satmap = fe->getSatellites(); satellite_map_t & satmap = fe->getSatellites();
@@ -969,14 +978,14 @@ int CScanSetup::showScanMenuSatFind()
continue; continue;
std::string satname = CServiceManager::getInstance()->GetSatelliteName(sit->first); std::string satname = CServiceManager::getInstance()->GetSatelliteName(sit->first);
feSatSelect->addOption(satname.c_str()); feSatSelect->addOption(satname.c_str());
if (!sfound && strcmp(scansettings.satName, satname.c_str()) == 0) if (!sfound && (scansettings.satName == satname))
sfound = true; sfound = true;
if (!sfound && firstname.empty()) if (!sfound && firstname.empty())
firstname = satname; firstname = satname;
count++; count++;
} }
if(count && !sfound) if(count && !sfound)
snprintf(scansettings.satName, sizeof(scansettings.satName), "%s", firstname.c_str()); scansettings.satName = firstname;
sat_findMenu->addItem(feSatSelect); sat_findMenu->addItem(feSatSelect);
@@ -1065,7 +1074,7 @@ void CScanSetup::addScanMenuManualScan(CMenuWidget *manual_Scan)
manual_Scan->addIntroItems(); manual_Scan->addIntroItems();
//---------------------------------------------------------------------- //----------------------------------------------------------------------
if (r_system == DVB_C) { if (r_system == DVB_C) {
CMenuOptionStringChooser * cableSelect = new CMenuOptionStringChooser(LOCALE_CABLESETUP_PROVIDER, scansettings.cableName, true, this, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED, true); CMenuOptionStringChooser * cableSelect = new CMenuOptionStringChooser(LOCALE_CABLESETUP_PROVIDER, &scansettings.cableName, true, this, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED, true);
cableSelect->setHint("", LOCALE_MENU_HINT_SCAN_CABLE); cableSelect->setHint("", LOCALE_MENU_HINT_SCAN_CABLE);
fillCableSelect(cableSelect); fillCableSelect(cableSelect);
manual_Scan->addItem(cableSelect); manual_Scan->addItem(cableSelect);
@@ -1074,7 +1083,7 @@ void CScanSetup::addScanMenuManualScan(CMenuWidget *manual_Scan)
manual_Scan->addItem(mf); manual_Scan->addItem(mf);
mf = new CMenuDForwarder(LOCALE_SCANTS_SELECT_TP, true, NULL, new CTPSelectHandler(), "cable", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN); mf = new CMenuDForwarder(LOCALE_SCANTS_SELECT_TP, true, NULL, new CTPSelectHandler(), "cable", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN);
} else { } else {
CMenuOptionStringChooser * satSelect = new CMenuOptionStringChooser(LOCALE_SATSETUP_SATELLITE, scansettings.satName, true, this, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED, true); CMenuOptionStringChooser * satSelect = new CMenuOptionStringChooser(LOCALE_SATSETUP_SATELLITE, &scansettings.satName, true, this, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED, true);
satSelect->setHint("", LOCALE_MENU_HINT_SCAN_SATELLITE); satSelect->setHint("", LOCALE_MENU_HINT_SCAN_SATELLITE);
/* add configured satellites to satSelect */ /* add configured satellites to satSelect */
fillSatSelect(satSelect); fillSatSelect(satSelect);
@@ -1168,7 +1177,7 @@ void CScanSetup::addScanMenuAutoScan(CMenuWidget *auto_Scan)
auto_Scan->addIntroItems(); auto_Scan->addIntroItems();
if (r_system == DVB_C) { //cable if (r_system == DVB_C) { //cable
CMenuOptionStringChooser * cableSelect = new CMenuOptionStringChooser(LOCALE_CABLESETUP_PROVIDER, scansettings.cableName, true, this, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED, true); CMenuOptionStringChooser * cableSelect = new CMenuOptionStringChooser(LOCALE_CABLESETUP_PROVIDER, &scansettings.cableName, true, this, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED, true);
cableSelect->setHint("", LOCALE_MENU_HINT_SCAN_CABLE); cableSelect->setHint("", LOCALE_MENU_HINT_SCAN_CABLE);
fillCableSelect(cableSelect); fillCableSelect(cableSelect);
auto_Scan->addItem(cableSelect); auto_Scan->addItem(cableSelect);
@@ -1176,7 +1185,7 @@ void CScanSetup::addScanMenuAutoScan(CMenuWidget *auto_Scan)
mf->setHint("", LOCALE_MENU_HINT_SCAN_NID); mf->setHint("", LOCALE_MENU_HINT_SCAN_NID);
auto_Scan->addItem(mf); auto_Scan->addItem(mf);
} else { } else {
CMenuOptionStringChooser * satSelect = new CMenuOptionStringChooser(LOCALE_SATSETUP_SATELLITE, scansettings.satName, true, this, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED, true); CMenuOptionStringChooser * satSelect = new CMenuOptionStringChooser(LOCALE_SATSETUP_SATELLITE, &scansettings.satName, true, this, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED, true);
satSelect->setHint("", LOCALE_MENU_HINT_SCAN_SATELLITE); satSelect->setHint("", LOCALE_MENU_HINT_SCAN_SATELLITE);
/* add configured satellites to satSelect */ /* add configured satellites to satSelect */
fillSatSelect(satSelect); fillSatSelect(satSelect);
@@ -1202,7 +1211,7 @@ void CScanSetup::addScanMenuCable(CMenuWidget *menu)
menu->addIntroItems(); menu->addIntroItems();
//---------------------------------------------------------------------- //----------------------------------------------------------------------
CMenuOptionStringChooser * select = new CMenuOptionStringChooser(LOCALE_CABLESETUP_PROVIDER, scansettings.cableName, true, this, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED, true); CMenuOptionStringChooser * select = new CMenuOptionStringChooser(LOCALE_CABLESETUP_PROVIDER, &scansettings.cableName, true, this, CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED, true);
fillCableSelect(select); fillCableSelect(select);
select->setHint("", LOCALE_MENU_HINT_SCAN_CABLE); select->setHint("", LOCALE_MENU_HINT_SCAN_CABLE);
menu->addItem(select); menu->addItem(select);
@@ -1217,11 +1226,11 @@ void CScanSetup::addScanMenuCable(CMenuWidget *menu)
menu->addItem(GenericMenuSeparatorLine); menu->addItem(GenericMenuSeparatorLine);
CStringInput *freq = new CStringInput(LOCALE_EXTRA_TP_FREQ, (char *) scansettings.cable_TP_freq, 6, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789"); CStringInput *freq = new CStringInput(LOCALE_EXTRA_TP_FREQ, &scansettings.cable_TP_freq, 6, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789");
CMenuForwarder *Freq = new CMenuDForwarder(LOCALE_EXTRA_TP_FREQ, true, scansettings.cable_TP_freq, freq, "", CRCInput::convertDigitToKey(shortCut++)); CMenuForwarder *Freq = new CMenuDForwarder(LOCALE_EXTRA_TP_FREQ, true, scansettings.cable_TP_freq, freq, "", CRCInput::convertDigitToKey(shortCut++));
Freq->setHint("", LOCALE_MENU_HINT_SCAN_FREQ); Freq->setHint("", LOCALE_MENU_HINT_SCAN_FREQ);
CStringInput *rate = new CStringInput(LOCALE_EXTRA_TP_RATE, (char *) scansettings.cable_TP_rate, 8, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789"); CStringInput *rate = new CStringInput(LOCALE_EXTRA_TP_RATE, &scansettings.cable_TP_rate, 8, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789");
CMenuForwarder *Rate = new CMenuDForwarder(LOCALE_EXTRA_TP_RATE, true, scansettings.cable_TP_rate, rate, "", CRCInput::convertDigitToKey(shortCut++)); CMenuForwarder *Rate = new CMenuDForwarder(LOCALE_EXTRA_TP_RATE, true, scansettings.cable_TP_rate, rate, "", CRCInput::convertDigitToKey(shortCut++));
Rate->setHint("", LOCALE_MENU_HINT_SCAN_RATE); Rate->setHint("", LOCALE_MENU_HINT_SCAN_RATE);
@@ -1263,11 +1272,11 @@ int CScanSetup::addScanOptionsItems(CMenuWidget *options_menu, const int &shortc
CMenuForwarder *Freq = NULL; CMenuForwarder *Freq = NULL;
CMenuForwarder *Rate = NULL; CMenuForwarder *Rate = NULL;
if (r_system == DVB_S) { if (r_system == DVB_S) {
CStringInput *freq = new CStringInput(LOCALE_EXTRA_TP_FREQ, (char *) scansettings.sat_TP_freq, 8, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789"); CStringInput *freq = new CStringInput(LOCALE_EXTRA_TP_FREQ, &scansettings.sat_TP_freq, 8, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789");
Freq = new CMenuDForwarder(LOCALE_EXTRA_TP_FREQ, true, scansettings.sat_TP_freq, freq, "", CRCInput::convertDigitToKey(shortCut++)); Freq = new CMenuDForwarder(LOCALE_EXTRA_TP_FREQ, true, scansettings.sat_TP_freq, freq, "", CRCInput::convertDigitToKey(shortCut++));
Freq->setHint("", LOCALE_MENU_HINT_SCAN_FREQ); Freq->setHint("", LOCALE_MENU_HINT_SCAN_FREQ);
CStringInput *rate = new CStringInput(LOCALE_EXTRA_TP_RATE, (char *) scansettings.sat_TP_rate, 8, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789"); CStringInput *rate = new CStringInput(LOCALE_EXTRA_TP_RATE, &scansettings.sat_TP_rate, 8, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789");
Rate = new CMenuDForwarder(LOCALE_EXTRA_TP_RATE, true, scansettings.sat_TP_rate, rate, "", CRCInput::convertDigitToKey(shortCut++)); Rate = new CMenuDForwarder(LOCALE_EXTRA_TP_RATE, true, scansettings.sat_TP_rate, rate, "", CRCInput::convertDigitToKey(shortCut++));
Rate->setHint("", LOCALE_MENU_HINT_SCAN_RATE); Rate->setHint("", LOCALE_MENU_HINT_SCAN_RATE);
fec = new CMenuOptionChooser(LOCALE_EXTRA_TP_FEC, (int *)&scansettings.sat_TP_fec, SATSETUP_SCANTP_FEC, SATSETUP_SCANTP_FEC_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++), "", true); fec = new CMenuOptionChooser(LOCALE_EXTRA_TP_FEC, (int *)&scansettings.sat_TP_fec, SATSETUP_SCANTP_FEC, SATSETUP_SCANTP_FEC_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++), "", true);
@@ -1275,11 +1284,11 @@ int CScanSetup::addScanOptionsItems(CMenuWidget *options_menu, const int &shortc
mod_pol = new CMenuOptionChooser(LOCALE_EXTRA_TP_POL, (int *)&scansettings.sat_TP_pol, SATSETUP_SCANTP_POL, SATSETUP_SCANTP_POL_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++)); mod_pol = new CMenuOptionChooser(LOCALE_EXTRA_TP_POL, (int *)&scansettings.sat_TP_pol, SATSETUP_SCANTP_POL, SATSETUP_SCANTP_POL_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++));
mod_pol->setHint("", LOCALE_MENU_HINT_SCAN_POL); mod_pol->setHint("", LOCALE_MENU_HINT_SCAN_POL);
} else if (r_system == DVB_C) { } else if (r_system == DVB_C) {
CStringInput *freq = new CStringInput(LOCALE_EXTRA_TP_FREQ, (char *) scansettings.cable_TP_freq, 6, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789"); CStringInput *freq = new CStringInput(LOCALE_EXTRA_TP_FREQ, &scansettings.cable_TP_freq, 6, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789");
Freq = new CMenuDForwarder(LOCALE_EXTRA_TP_FREQ, true, scansettings.cable_TP_freq, freq, "", CRCInput::convertDigitToKey(shortCut++)); Freq = new CMenuDForwarder(LOCALE_EXTRA_TP_FREQ, true, scansettings.cable_TP_freq, freq, "", CRCInput::convertDigitToKey(shortCut++));
Freq->setHint("", LOCALE_MENU_HINT_SCAN_FREQ); Freq->setHint("", LOCALE_MENU_HINT_SCAN_FREQ);
CStringInput *rate = new CStringInput(LOCALE_EXTRA_TP_RATE, (char *) scansettings.cable_TP_rate, 8, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789"); CStringInput *rate = new CStringInput(LOCALE_EXTRA_TP_RATE, &scansettings.cable_TP_rate, 8, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "0123456789");
Rate = new CMenuDForwarder(LOCALE_EXTRA_TP_RATE, true, scansettings.cable_TP_rate, rate, "", CRCInput::convertDigitToKey(shortCut++)); Rate = new CMenuDForwarder(LOCALE_EXTRA_TP_RATE, true, scansettings.cable_TP_rate, rate, "", CRCInput::convertDigitToKey(shortCut++));
Rate->setHint("", LOCALE_MENU_HINT_SCAN_RATE); Rate->setHint("", LOCALE_MENU_HINT_SCAN_RATE);
mod_pol = new CMenuOptionChooser(LOCALE_EXTRA_TP_MOD, (int *)&scansettings.cable_TP_mod, SATSETUP_SCANTP_MOD, SATSETUP_SCANTP_MOD_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++)); mod_pol = new CMenuOptionChooser(LOCALE_EXTRA_TP_MOD, (int *)&scansettings.cable_TP_mod, SATSETUP_SCANTP_MOD, SATSETUP_SCANTP_MOD_COUNT, true, NULL, CRCInput::convertDigitToKey(shortCut++));
@@ -1414,11 +1423,11 @@ bool CScanSetup::changeNotify(const neutrino_locale_t OptionName, void * /*data*
fe->setMaster(femaster); fe->setMaster(femaster);
} }
else if(ARE_LOCALES_EQUAL(OptionName, LOCALE_CABLESETUP_PROVIDER)) { else if(ARE_LOCALES_EQUAL(OptionName, LOCALE_CABLESETUP_PROVIDER)) {
printf("[neutrino] CScanSetup::%s: new provider: [%s]\n", __FUNCTION__, scansettings.cableName); printf("[neutrino] CScanSetup::%s: new provider: [%s]\n", __FUNCTION__, scansettings.cableName.c_str());
satellite_map_t & satmap = CServiceManager::getInstance()->SatelliteList(); satellite_map_t & satmap = CServiceManager::getInstance()->SatelliteList();
for (sat_iterator_t sit = satmap.begin(); sit != satmap.end(); sit++) for (sat_iterator_t sit = satmap.begin(); sit != satmap.end(); sit++)
{ {
if (strcmp(scansettings.cableName, sit->second.name.c_str()) == 0) { if (scansettings.cableName == sit->second.name) {
if(sit->second.cable_nid > 0) { if(sit->second.cable_nid > 0) {
scansettings.cable_nid = sit->second.cable_nid; scansettings.cable_nid = sit->second.cable_nid;
nid->updateValue(); nid->updateValue();
@@ -1464,20 +1473,18 @@ void CScanSetup::updateManualSettings()
CFrontend * frontend = CFEManager::getInstance()->getLiveFE(); CFrontend * frontend = CFEManager::getInstance()->getLiveFE();
switch (frontend->getType()) { switch (frontend->getType()) {
case FE_QPSK: case FE_QPSK:
sprintf(scansettings.sat_TP_freq, "%d", tI->second.feparams.dvb_feparams.frequency); scansettings.sat_TP_freq = to_string(tI->second.feparams.dvb_feparams.frequency);
sprintf(scansettings.sat_TP_rate, "%d", tI->second.feparams.dvb_feparams.u.qpsk.symbol_rate); scansettings.sat_TP_rate = to_string(tI->second.feparams.dvb_feparams.u.qpsk.symbol_rate);
scansettings.sat_TP_fec = tI->second.feparams.dvb_feparams.u.qpsk.fec_inner; scansettings.sat_TP_fec = tI->second.feparams.dvb_feparams.u.qpsk.fec_inner;
scansettings.sat_TP_pol = tI->second.polarization; scansettings.sat_TP_pol = tI->second.polarization;
strncpy(scansettings.satName, scansettings.satName = CServiceManager::getInstance()->GetSatelliteName(channel->getSatellitePosition());
CServiceManager::getInstance()->GetSatelliteName(channel->getSatellitePosition()).c_str(), 50);
break; break;
case FE_QAM: case FE_QAM:
sprintf(scansettings.cable_TP_freq, "%d", tI->second.feparams.dvb_feparams.frequency); scansettings.cable_TP_freq = to_string(tI->second.feparams.dvb_feparams.frequency);
sprintf(scansettings.cable_TP_rate, "%d", tI->second.feparams.dvb_feparams.u.qam.symbol_rate); scansettings.cable_TP_rate = to_string(tI->second.feparams.dvb_feparams.u.qam.symbol_rate);
scansettings.cable_TP_fec = tI->second.feparams.dvb_feparams.u.qam.fec_inner; scansettings.cable_TP_fec = tI->second.feparams.dvb_feparams.u.qam.fec_inner;
scansettings.cable_TP_mod = tI->second.feparams.dvb_feparams.u.qam.modulation; scansettings.cable_TP_mod = tI->second.feparams.dvb_feparams.u.qam.modulation;
strncpy(scansettings.cableName, scansettings.cableName = CServiceManager::getInstance()->GetSatelliteName(channel->getSatellitePosition());
CServiceManager::getInstance()->GetSatelliteName(channel->getSatellitePosition()).c_str(), 50);
break; break;
case FE_OFDM: case FE_OFDM:
case FE_ATSC: case FE_ATSC:
@@ -1502,14 +1509,14 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &actionkey)
parent->hide(); parent->hide();
t_satellite_position position; t_satellite_position position;
char * name; std::string name;
if (actionkey == "sat") if (actionkey == "sat")
name = scansettings.satName; name = scansettings.satName;
else else
name = scansettings.cableName; name = scansettings.cableName;
position = CServiceManager::getInstance()->GetSatellitePosition(name); position = CServiceManager::getInstance()->GetSatellitePosition(name.c_str());
INFO("%s: %s\n", actionkey.c_str(), name); INFO("%s: %s\n", actionkey.c_str(), name.c_str());
if (old_position != position) { if (old_position != position) {
old_selected = 0; old_selected = 0;
@@ -1565,14 +1572,14 @@ int CTPSelectHandler::exec(CMenuTarget* parent, const std::string &actionkey)
switch (tmpI->second.deltype) { switch (tmpI->second.deltype) {
case FE_QPSK: case FE_QPSK:
sprintf(scansettings.sat_TP_freq, "%d", tmpI->second.feparams.dvb_feparams.frequency); scansettings.sat_TP_freq = to_string(tmpI->second.feparams.dvb_feparams.frequency);
sprintf(scansettings.sat_TP_rate, "%d", tmpI->second.feparams.dvb_feparams.u.qpsk.symbol_rate); scansettings.sat_TP_rate = to_string(tmpI->second.feparams.dvb_feparams.u.qpsk.symbol_rate);
scansettings.sat_TP_fec = tmpI->second.feparams.dvb_feparams.u.qpsk.fec_inner; scansettings.sat_TP_fec = tmpI->second.feparams.dvb_feparams.u.qpsk.fec_inner;
scansettings.sat_TP_pol = tmpI->second.polarization; scansettings.sat_TP_pol = tmpI->second.polarization;
break; break;
case FE_QAM: case FE_QAM:
sprintf(scansettings.cable_TP_freq, "%d", tmpI->second.feparams.dvb_feparams.frequency); scansettings.cable_TP_freq = to_string(tmpI->second.feparams.dvb_feparams.frequency);
sprintf(scansettings.cable_TP_rate, "%d", tmpI->second.feparams.dvb_feparams.u.qam.symbol_rate); scansettings.cable_TP_rate = to_string(tmpI->second.feparams.dvb_feparams.u.qam.symbol_rate);
scansettings.cable_TP_fec = tmpI->second.feparams.dvb_feparams.u.qam.fec_inner; scansettings.cable_TP_fec = tmpI->second.feparams.dvb_feparams.u.qam.fec_inner;
scansettings.cable_TP_mod = tmpI->second.feparams.dvb_feparams.u.qam.modulation; scansettings.cable_TP_mod = tmpI->second.feparams.dvb_feparams.u.qam.modulation;
break; break;

31
src/gui/test_menu.cpp
View File

@@ -302,9 +302,8 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
{ {
int fnum = atoi(actionKey.substr(5, 1).c_str()); int fnum = atoi(actionKey.substr(5, 1).c_str());
printf("22kon: fe %d sat pos %d\n", fnum, test_pos[fnum]); printf("22kon: fe %d sat pos %d\n", fnum, test_pos[fnum]);
sprintf(scansettings.sat_TP_freq, "%d", 12000*1000); scansettings.sat_TP_freq = "12000000";
strncpy(scansettings.satName, scansettings.satName = CServiceManager::getInstance()->GetSatelliteName(test_pos[fnum]);
CServiceManager::getInstance()->GetSatelliteName(test_pos[fnum]).c_str(), 50);
CScanTs scanTs(FE_QPSK); CScanTs scanTs(FE_QPSK);
scanTs.exec(NULL, "test"); scanTs.exec(NULL, "test");
return res; return res;
@@ -313,9 +312,8 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
{ {
int fnum = atoi(actionKey.substr(6, 1).c_str()); int fnum = atoi(actionKey.substr(6, 1).c_str());
printf("22koff: fe %d sat pos %d\n", fnum, test_pos[fnum]); printf("22koff: fe %d sat pos %d\n", fnum, test_pos[fnum]);
sprintf(scansettings.sat_TP_freq, "%d", 11000*1000); scansettings.sat_TP_freq = "11000000";
strncpy(scansettings.satName, scansettings.satName = CServiceManager::getInstance()->GetSatelliteName(test_pos[fnum]);
CServiceManager::getInstance()->GetSatelliteName(test_pos[fnum]).c_str(), 50);
CScanTs scanTs(FE_QPSK); CScanTs scanTs(FE_QPSK);
scanTs.exec(NULL, "test"); scanTs.exec(NULL, "test");
return res; return res;
@@ -328,12 +326,11 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
CFrontend *frontend = CFEManager::getInstance()->getFE(fnum); CFrontend *frontend = CFEManager::getInstance()->getFE(fnum);
switch (frontend->getInfo()->type) { switch (frontend->getInfo()->type) {
case FE_QPSK: case FE_QPSK:
strncpy(scansettings.satName, scansettings.satName = CServiceManager::getInstance()->GetSatelliteName(test_pos[fnum]);
CServiceManager::getInstance()->GetSatelliteName(test_pos[fnum]).c_str(), 50); scansettings.sat_TP_freq = (fnum & 1) ? "12439000": "12538000";
sprintf(scansettings.sat_TP_freq, "%d", (fnum & 1) ? 12439000: 12538000); scansettings.sat_TP_rate = (fnum & 1) ? "2500000" : "41250000";
sprintf(scansettings.sat_TP_rate, "%d", (fnum & 1) ? 2500*1000 : 41250*1000); scansettings.sat_TP_fec = (fnum & 1) ? FEC_3_4 : FEC_1_2;
scansettings.sat_TP_fec = (fnum & 1) ? FEC_3_4 : FEC_1_2; scansettings.sat_TP_pol = (fnum & 1) ? 0 : 1;
scansettings.sat_TP_pol = (fnum & 1) ? 0 : 1;
break; break;
case FE_QAM: case FE_QAM:
{ {
@@ -344,11 +341,11 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
fe->setMode(CFrontend::FE_MODE_UNUSED); fe->setMode(CFrontend::FE_MODE_UNUSED);
} }
frontend->setMode(CFrontend::FE_MODE_INDEPENDENT); frontend->setMode(CFrontend::FE_MODE_INDEPENDENT);
strncpy(scansettings.cableName, "CST Berlin", 50); scansettings.cableName = "CST Berlin";
sprintf(scansettings.cable_TP_freq, "%d", 474*1000); scansettings.cable_TP_freq = "474000";
sprintf(scansettings.cable_TP_rate, "%d", 6875*1000); scansettings.cable_TP_rate = "6875000";
scansettings.cable_TP_fec = 1; scansettings.cable_TP_fec = 1;
scansettings.cable_TP_mod = 5; scansettings.cable_TP_mod = 5;
} }
break; break;
case FE_OFDM: case FE_OFDM:

24
src/system/settings.cpp
View File

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

13
src/system/settings.h
View File

@@ -762,17 +762,17 @@ class CScanSettings
int fast_op; int fast_op;
int cable_nid; int cable_nid;
char satName[50]; std::string satName;
int sat_TP_fec; int sat_TP_fec;
int sat_TP_pol; int sat_TP_pol;
char sat_TP_freq[10]; std::string sat_TP_freq;
char sat_TP_rate[9]; std::string sat_TP_rate;
char cableName[50]; std::string cableName;
int cable_TP_mod; int cable_TP_mod;
int cable_TP_fec; int cable_TP_fec;
char cable_TP_freq[10]; std::string cable_TP_freq;
char cable_TP_rate[9]; std::string cable_TP_rate;
CScanSettings(); CScanSettings();
@@ -781,5 +781,4 @@ class CScanSettings
bool saveSettings(const char * const fileName); bool saveSettings(const char * const fileName);
}; };
#endif #endif