Remove extern frontend

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1568 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-07-21 10:34:32 +00:00
parent 2569ec4d33
commit 53f4be8a27
7 changed files with 33 additions and 50 deletions

View File

@@ -48,12 +48,10 @@
#include "gui/widget/hintbox.h"
#include "gui/scan.h"
#include "gui/scan_setup.h"
#include <zapit/frontend_c.h>
extern int cs_test_card(int unit, char * str);
#include <zapit/frontend_c.h>
extern CFrontend * frontend;
CTestMenu::CTestMenu()
{
width = w_max (50, 10);
@@ -256,7 +254,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
sprintf(scansettings.TP_freq, "%d", freq);
#if 0 // not needed ?
switch (frontend->getInfo()->type)
switch (CFrontend::getInstance()->getInfo()->type)
{
case FE_QPSK:
sprintf(scansettings.TP_rate, "%d", tmpI->second.feparams.u.qpsk.symbol_rate);
@@ -281,7 +279,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
int freq = 12538000;
sprintf(scansettings.TP_freq, "%d", freq);
switch (frontend->getInfo()->type)
switch (CFrontend::getInstance()->getInfo()->type)
{
case FE_QPSK:
sprintf(scansettings.TP_rate, "%d", 41250*1000);
@@ -322,7 +320,6 @@ void CTestMenu::showTestMenu()
CMenuWidget * TestMenu = new CMenuWidget(rev /*"Test menu"*/);
TestMenu->setSelected(selected);
TestMenu->addIntroItems();
TestMenu->addItem(new CMenuForwarderNonLocalized("VFD", true, NULL, this, "vfd"));
TestMenu->addItem(new CMenuForwarderNonLocalized("Network", true, NULL, this, "network"));
TestMenu->addItem(new CMenuForwarderNonLocalized("Smartcard 1", true, NULL, this, "card0"));