mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

rework VUPLUS defines

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: e299801f1f
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-06-12 (Fri, 12 Jun 2020)

Origin message was:
------------------
- rework VUPLUS defines

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-06-12 22:27:13 +02:00
parent e3d2e27d76
commit 9b6e6bea2f
13 changed files with 53 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/cam_menu.cpp
View File

@@ -77,13 +77,13 @@ const CMenuOptionChooser::keyval OPTIONS_CI_MODE_OPTIONS[] =
static const CMenuOptionChooser::keyval CI_CLOCK_OPTIONS[] = {
{ 6, LOCALE_CI_CLOCK_NORMAL },
{ 7, LOCALE_CI_CLOCK_HIGH }
#if BOXMODEL_VUPLUS
#if BOXMODEL_VUPLUS_ALL
,{ 12, LOCALE_CI_CLOCK_EXTRA_HIGH }
#endif
};
#define CI_CLOCK_OPTION_COUNT (sizeof(CI_CLOCK_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
#if BOXMODEL_VUPLUS
#if BOXMODEL_VUPLUS_ALL
#define CI_DELAY_OPTION_COUNT 5
static const CMenuOptionChooser::keyval_ext CI_DELAY_OPTIONS[CI_DELAY_OPTION_COUNT] = {
{ 16, NONEXISTANT_LOCALE, "16" },
@@ -156,7 +156,7 @@ int CCAMMenuHandler::doMainMenu()
int CiSlots = ca ? ca->GetNumberCISlots() : 0;
if(CiSlots) {
#if BOXMODEL_VUPLUS
#if BOXMODEL_VUPLUS_ALL
cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_DELAY, &g_settings.ci_delay, CI_DELAY_OPTIONS, CI_DELAY_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));
@@ -216,7 +216,7 @@ int CCAMMenuHandler::doMainMenu()
#else
cammenu->addItem(new CMenuOptionNumberChooser(LOCALE_CI_CLOCK, &g_settings.ci_clock[i], true, 6, 12, this));
#endif
#if BOXMODEL_VUPLUS
#if BOXMODEL_VUPLUS_ALL
cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_RPR, &g_settings.ci_rpr[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
#endif
cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_IGNORE_MSG, &g_settings.ci_ignore_messages[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
@@ -616,7 +616,7 @@ int CCAMMenuHandler::doMenu(int slot, CA_SLOT_TYPE slotType)
bool CCAMMenuHandler::changeNotify(const neutrino_locale_t OptionName, void * Data)
{
#if BOXMODEL_VUPLUS
#if BOXMODEL_VUPLUS_ALL
if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CI_DELAY)) {
printf("CCAMMenuHandler::changeNotify: ci_delay %d\n", g_settings.ci_delay);
ca->SetCIDelay(g_settings.ci_delay);