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

move ci clock and ci relevant pids routing to each slot menu (but still only valid for slot 0)

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 912df02032
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2020-01-18 (Sat, 18 Jan 2020)


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

------------------
This commit was generated by Migit
This commit is contained in:
BPanther
2020-01-18 23:06:11 +01:00
committed by vanhofen
parent 7cd92a9905
commit 224aebaf9e
5 changed files with 56 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/gui/cam_menu.cpp
View File

@@ -54,6 +54,8 @@
#include <zapit/zapit.h>
#include <driver/abstime.h>
int CISlot = 0;
//NI CA init
extern Zapit_config zapitCfg;
@@ -158,14 +160,8 @@ int CCAMMenuHandler::doMainMenu()
if(CiSlots) {
#if BOXMODEL_VUPLUS
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
cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_CLOCK, &g_settings.ci_clock, CI_CLOCK_OPTIONS, CI_CLOCK_OPTION_COUNT, true, this));
#else
cammenu->addItem(new CMenuOptionNumberChooser(LOCALE_CI_CLOCK, &g_settings.ci_clock, true, 6, 12, this));
#endif
}
cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_IGNORE_MSG, &g_settings.ci_ignore_messages, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_SAVE_PINCODE, &g_settings.ci_save_pincode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
@@ -219,6 +215,14 @@ int CCAMMenuHandler::doMainMenu()
snprintf(tmp, sizeof(tmp), "ca_ci_reset%d", i);
cammenu->addItem(new CMenuForwarder(LOCALE_CI_RESET, true, NULL, this, tmp));
memset(name1,0,sizeof(name1));
if (i == 0) { // only for slot 0 valid - fix later
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_CLOCK, &g_settings.ci_clock[i], CI_CLOCK_OPTIONS, CI_CLOCK_OPTION_COUNT, true, this));
#else
cammenu->addItem(new CMenuOptionNumberChooser(LOCALE_CI_CLOCK, &g_settings.ci_clock[i], true, 6, 12, this));
#endif
cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_RPR, &g_settings.ci_rpr[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
}
} else {
snprintf(str1, sizeof(str1), "%s %d", g_Locale->getText(LOCALE_CI_EMPTY), i);
tempMenu = new CMenuWidget(str1, NEUTRINO_ICON_SETTINGS);
@@ -557,7 +561,6 @@ int CCAMMenuHandler::doMenu(int slot, CA_SLOT_TYPE slotType)
menu_type = slotType;
while(!doexit) {
printf("CCAMMenuHandler::doMenu: enter menu for slot %d\n", slot);
timeoutEnd = CRCInput::calcTimeoutEnd(10);
ca->MenuEnter(slotType, slot);
@@ -620,15 +623,15 @@ bool CCAMMenuHandler::changeNotify(const neutrino_locale_t OptionName, void * Da
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);
printf("CCAMMenuHandler::changeNotify: ci_rpr[%d] %d\n", CISlot, g_settings.ci_rpr[CISlot]);
ca->SetCIRelevantPidsRouting(g_settings.ci_rpr[CISlot]);
return true;
}
else
#endif
if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CI_CLOCK)) {
printf("CCAMMenuHandler::changeNotify: ci_clock %d\n", g_settings.ci_clock);
ca->SetTSClock(g_settings.ci_clock * 1000000);
printf("CCAMMenuHandler::changeNotify: ci_clock[%s] %d\n", CISlot, g_settings.ci_clock[CISlot]);
ca->SetTSClock(g_settings.ci_clock[CISlot] * 1000000);
return true;
}
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CI_SAVE_PINCODE)) {