gui/scan_setup.cpp: try to fix tuner setup enable/disable options for unicable

Origin commit data
------------------
Branch: ni/coolstream
Commit: d09dd4e75f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2013-01-09 20:40:08 +04:00
parent 20a931a762
commit ae44d2039a

View File

@@ -616,7 +616,8 @@ int CScanSetup::showFrontendSetup(int number)
/* diseqc type select */ /* diseqc type select */
dtype = new CMenuOptionChooser(LOCALE_SATSETUP_DISEQC, (int *)&dmode, SATSETUP_DISEQC_OPTIONS, SATSETUP_DISEQC_OPTION_COUNT, dtype = new CMenuOptionChooser(LOCALE_SATSETUP_DISEQC, (int *)&dmode, SATSETUP_DISEQC_OPTIONS, SATSETUP_DISEQC_OPTION_COUNT,
allow_moptions, this, CRCInput::convertDigitToKey(shortcut++), "", true); femode != CFrontend::FE_MODE_UNUSED && femode != CFrontend::FE_MODE_LINK_LOOP,
this, CRCInput::convertDigitToKey(shortcut++), "", true);
dtype->setHint("", LOCALE_MENU_HINT_SCAN_DISEQCTYPE); dtype->setHint("", LOCALE_MENU_HINT_SCAN_DISEQCTYPE);
setupMenu->addItem(dtype); setupMenu->addItem(dtype);
@@ -1247,6 +1248,7 @@ bool CScanSetup::changeNotify(const neutrino_locale_t OptionName, void * /*data*
CFrontend * fe = CFEManager::getInstance()->getFE(fenumber); CFrontend * fe = CFEManager::getInstance()->getFE(fenumber);
fe->setDiseqcType((diseqc_t) dmode); fe->setDiseqcType((diseqc_t) dmode);
#if 0
if(femode != CFEManager::FE_MODE_ALONE) if(femode != CFEManager::FE_MODE_ALONE)
CFEManager::getInstance()->saveSettings(true); CFEManager::getInstance()->saveSettings(true);
@@ -1275,6 +1277,10 @@ bool CScanSetup::changeNotify(const neutrino_locale_t OptionName, void * /*data*
} }
ojDiseqcRepeats->setActive(true); ojDiseqcRepeats->setActive(true);
} }
#endif
uniSetup->setActive(dmode == DISEQC_UNICABLE);
bool enable = (dmode < DISEQC_ADVANCED) && (dmode != NO_DISEQC);
ojDiseqcRepeats->setActive(enable);
} }
else if(ARE_LOCALES_EQUAL(OptionName, LOCALE_SATSETUP_FE_MODE)) { else if(ARE_LOCALES_EQUAL(OptionName, LOCALE_SATSETUP_FE_MODE)) {
@@ -1298,10 +1304,13 @@ bool CScanSetup::changeNotify(const neutrino_locale_t OptionName, void * /*data*
CFrontend * fe = CFEManager::getInstance()->getFE(fenumber); CFrontend * fe = CFEManager::getInstance()->getFE(fenumber);
if (fe) { if (fe) {
linkfe->setActive(CFrontend::linked(femode)); linkfe->setActive(CFrontend::linked(femode));
dtype->setActive(!CFrontend::linked(femode)); //dtype->setActive(!CFrontend::linked(femode));
fsatSelect->setActive(!CFrontend::linked(femode)); dtype->setActive(femode != CFrontend::FE_MODE_UNUSED && femode != CFrontend::FE_MODE_LINK_LOOP);
fsatSetup->setActive(!CFrontend::linked(femode)); uniSetup->setActive(dmode == DISEQC_UNICABLE && femode != CFrontend::FE_MODE_UNUSED && femode != CFrontend::FE_MODE_LINK_LOOP);
ojDiseqcRepeats->setActive(!CFrontend::linked(femode) && dmode > NO_DISEQC); fsatSelect->setActive(!CFrontend::linked(femode) && femode != CFrontend::FE_MODE_UNUSED);
fsatSetup->setActive(!CFrontend::linked(femode) && femode != CFrontend::FE_MODE_UNUSED);
bool enable = (dmode < DISEQC_ADVANCED) && (dmode != NO_DISEQC);
ojDiseqcRepeats->setActive(!CFrontend::linked(femode) && enable);
fe->setMode(femode); fe->setMode(femode);
/* if mode changed, set current master too */ /* if mode changed, set current master too */