gui/test_menu.cpp: fix compile

This commit is contained in:
[CST] Focus
2013-04-16 12:53:54 +04:00
parent eedf2f9e49
commit 2cc3c213b5

View File

@@ -83,15 +83,15 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
CVFD::getInstance()->Clear(); CVFD::getInstance()->Clear();
int icon = 0x00040000; int icon = 0x00040000;
while (icon > 0x2) { while (icon > 0x2) {
CVFD::getInstance()->ShowIcon((vfd_icon) icon, true); CVFD::getInstance()->ShowIcon((fp_icon) icon, true);
icon /= 2; icon /= 2;
} }
for (int i = 0x01000001; i <= 0x0C000001; i+= 0x01000000) for (int i = 0x01000001; i <= 0x0C000001; i+= 0x01000000)
{ {
CVFD::getInstance()->ShowIcon((vfd_icon) i, true); CVFD::getInstance()->ShowIcon((fp_icon) i, true);
} }
CVFD::getInstance()->ShowIcon((vfd_icon) 0x09000002, true); CVFD::getInstance()->ShowIcon((fp_icon) 0x09000002, true);
CVFD::getInstance()->ShowIcon((vfd_icon) 0x0B000002, true); CVFD::getInstance()->ShowIcon((fp_icon) 0x0B000002, true);
char text[255]; char text[255];
char buf[XML_UTF8_ENCODE_MAX]; char buf[XML_UTF8_ENCODE_MAX];
int ch = 0x2588; int ch = 0x2588;
@@ -255,7 +255,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
{ {
CScanTs * scanTs = new CScanTs(); CScanTs * scanTs = new CScanTs();
int freq = (actionKey == "22kon1") ? 12000*1000: 11000*1000; int freq = (actionKey == "22kon1") ? 12000*1000: 11000*1000;
sprintf(scansettings.TP_freq, "%d", freq); sprintf(scansettings.sat_TP_freq, "%d", freq);
strncpy(scansettings.satName, strncpy(scansettings.satName,
CServiceManager::getInstance()->GetSatelliteName(130).c_str(), 50); CServiceManager::getInstance()->GetSatelliteName(130).c_str(), 50);
@@ -266,7 +266,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
else if (actionKey == "22kon2" || actionKey == "22koff2") else if (actionKey == "22kon2" || actionKey == "22koff2")
{ {
int freq = (actionKey == "22kon2") ? 12000*1000: 11000*1000; int freq = (actionKey == "22kon2") ? 12000*1000: 11000*1000;
sprintf(scansettings.TP_freq, "%d", freq); sprintf(scansettings.sat_TP_freq, "%d", freq);
strncpy(scansettings.satName, strncpy(scansettings.satName,
CServiceManager::getInstance()->GetSatelliteName(192).c_str(), 50); CServiceManager::getInstance()->GetSatelliteName(192).c_str(), 50);
@@ -286,19 +286,19 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
CServiceScan::getInstance()->SetFrontend(fnum); CServiceScan::getInstance()->SetFrontend(fnum);
int freq = 12538000; int freq = 12538000;
sprintf(scansettings.TP_freq, "%d", freq); sprintf(scansettings.sat_TP_freq, "%d", freq);
//CFrontend * frontend = CFEManager::getInstance()->getFE(0); //CFrontend * frontend = CFEManager::getInstance()->getFE(0);
switch (frontend->getInfo()->type) switch (frontend->getInfo()->type)
{ {
case FE_QPSK: case FE_QPSK:
sprintf(scansettings.TP_rate, "%d", 41250*1000); sprintf(scansettings.sat_TP_rate, "%d", 41250*1000);
scansettings.TP_fec = 1; scansettings.sat_TP_fec = 1;
scansettings.TP_pol = 1; scansettings.sat_TP_pol = 1;
break; break;
case FE_QAM: case FE_QAM:
#if 0 #if 0
sprintf(scansettings.TP_rate, "%d", tmpI->second.feparams.u.qam.symbol_rate); sprintf(scansettings.sat_TP_rate, "%d", tmpI->second.feparams.u.qam.symbol_rate);
scansettings.TP_fec = tmpI->second.feparams.u.qam.fec_inner; scansettings.sat_TP_fec = tmpI->second.feparams.u.qam.fec_inner;
scansettings.TP_mod = tmpI->second.feparams.u.qam.modulation; scansettings.TP_mod = tmpI->second.feparams.u.qam.modulation;
#endif #endif
break; break;
@@ -336,7 +336,7 @@ void CTestMenu::showTestMenu()
TestMenu->addItem(new CMenuForwarderNonLocalized("HDD", true, NULL, this, "hdd")); TestMenu->addItem(new CMenuForwarderNonLocalized("HDD", true, NULL, this, "hdd"));
TestMenu->addItem(new CMenuForwarderNonLocalized("Buttons", true, NULL, this, "buttons")); TestMenu->addItem(new CMenuForwarderNonLocalized("Buttons", true, NULL, this, "buttons"));
CFEManager::getInstance()->setMode(CFEManager::FE_MODE_ALONE); //CFEManager::getInstance()->setMode(CFEManager::FE_MODE_ALONE);
CServiceManager::getInstance()->InitSatPosition(130, NULL, true); CServiceManager::getInstance()->InitSatPosition(130, NULL, true);
CServiceManager::getInstance()->InitSatPosition(192, NULL, true); CServiceManager::getInstance()->InitSatPosition(192, NULL, true);