mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cst-next.pre' into cst-next

Browse Source
This commit is contained in:
Thilo Graf
2015-04-30 09:20:43 +02:00
parent 0896fa7bb8 7044df1f9f
commit a58f1621b4
81 changed files with 909 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/test_menu.cpp
View File

@@ -311,6 +311,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
return res;
}
#if 0 //some parts DEPRECATED
else if (actionKey.find("22kon") != std::string::npos)
{
int fnum = atoi(actionKey.substr(5, 1).c_str());
@@ -366,6 +367,7 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey)
scanTs.exec(NULL, "manual");
return res;
}
#endif
else if (actionKey == "button"){
if (button == NULL)
button = new CComponentsButtonRed(100, 100, 100, 50, "Test");
@@ -796,7 +798,7 @@ void CTestMenu::showHWTests(CMenuWidget *widget)
widget->addItem(new CMenuForwarder("Smartcard 2", true, NULL, this, "card1"));
widget->addItem(new CMenuForwarder("HDD", true, NULL, this, "hdd"));
widget->addItem(new CMenuForwarder("SD/MMC", true, NULL, this, "mmc"));
#if 0 //some parts DEPRECATED
for (unsigned i = 0; i < sizeof(test_pos)/sizeof(int); i++) {
CServiceManager::getInstance()->InitSatPosition(test_pos[i], NULL, true);
}
@@ -843,4 +845,5 @@ void CTestMenu::showHWTests(CMenuWidget *widget)
}
}
CFEManager::getInstance()->linkFrontends(true);
#endif
}