vuplus: relevant pids routing

Conflicts:
	src/neutrino.cpp
	src/system/settings.h
	src/zapit/include/zapit/zapit.h
	src/zapit/src/zapit.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>

fixes named: "vuplus: relevant pids routing - fix" are included
This commit is contained in:
BPanther
2020-01-18 11:36:58 +01:00
committed by Thilo Graf
parent 75e7bc7b28
commit 55bbe2c364
9 changed files with 143 additions and 94 deletions

View File

@@ -157,6 +157,7 @@ int CCAMMenuHandler::doMainMenu()
if(CiSlots) {
#if BOXMODEL_VUPLUS //FIXME: loacles not available
cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_DELAY, &g_settings.ci_delay, CI_DELAY_OPTIONS, CI_DELAY_OPTION_COUNT, true, this));
cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_RPR, &g_settings.ci_rpr, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
#endif
cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_RESET_STANDBY, &g_settings.ci_standby_reset, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
@@ -615,6 +616,11 @@ bool CCAMMenuHandler::changeNotify(const neutrino_locale_t OptionName, void * Da
ca->SetCIDelay(g_settings.ci_delay);
return true;
}
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CI_RPR)) {
printf("CCAMMenuHandler::changeNotify: ci_rpr %d\n", g_settings.ci_rpr);
ca->SetCIRelevantPidsRouting(g_settings.ci_rpr);
return true;
}
else
#endif
if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CI_CLOCK)) {