Merge branch 'dvbsi++' into next

Origin commit data
------------------
Commit: 1db9531bdc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
This commit is contained in:
[CST] Focus
2013-01-11 14:21:44 +04:00
9 changed files with 135 additions and 45 deletions

View File

@@ -899,13 +899,13 @@ int CScanSetup::showScanMenuSatFind()
void CScanSetup::addScanMenuTempSat(CMenuWidget *temp_sat, sat_config_t & satconfig)
{
temp_sat->addIntroItems();
CMenuOptionNumberChooser *diseqc;
CMenuOptionNumberChooser *comm;
CMenuOptionNumberChooser *uncomm;
CMenuOptionNumberChooser *unilnb;
CMenuOptionNumberChooser *motor;
CMenuOptionChooser *usals;
CMenuForwarder *mf;
CMenuOptionNumberChooser *diseqc = NULL;
CMenuOptionNumberChooser *comm = NULL;
CMenuOptionNumberChooser *uncomm = NULL;
CMenuOptionNumberChooser *unilnb = NULL;
CMenuOptionNumberChooser *motor = NULL;
CMenuOptionChooser *usals = NULL;
CMenuForwarder *mf = NULL;
bool unicable = (dmode == DISEQC_UNICABLE);
if (!unicable) {