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

ci slot settings

Browse Source 
Conflicts:
	src/gui/cam_menu.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 83d384ec4b
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2020-01-19 (Sun, 19 Jan 2020)



------------------
This commit was generated by Migit
This commit is contained in:
BPanther
2020-01-19 21:24:32 +01:00
committed by vanhofen
parent ab5921eb85
commit 9ec69c6e82
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gui/cam_menu.cpp
View File

@@ -54,8 +54,6 @@
#include <zapit/zapit.h> #include <zapit/zapit.h>
#include <driver/abstime.h> #include <driver/abstime.h>
int CISlot = 0;
//NI CA init //NI CA init
extern Zapit_config zapitCfg; extern Zapit_config zapitCfg;
@@ -213,7 +211,6 @@ int CCAMMenuHandler::doMainMenu()
snprintf(tmp, sizeof(tmp), "ca_ci_reset%d", i); snprintf(tmp, sizeof(tmp), "ca_ci_reset%d", i);
cammenu->addItem(new CMenuForwarder(LOCALE_CI_RESET, true, NULL, this, tmp)); cammenu->addItem(new CMenuForwarder(LOCALE_CI_RESET, true, NULL, this, tmp));
memset(name1,0,sizeof(name1)); memset(name1,0,sizeof(name1));
if (i == 0) { // only for slot 0 valid - fix later
#if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE #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)); cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_CLOCK, &g_settings.ci_clock[i], CI_CLOCK_OPTIONS, CI_CLOCK_OPTION_COUNT, true, this));
#else #else
@@ -224,7 +221,6 @@ if (i == 0) { // only for slot 0 valid - fix later
#endif #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)); cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_IGNORE_MSG, &g_settings.ci_ignore_messages[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true));
cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_SAVE_PINCODE, &g_settings.ci_save_pincode[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_SAVE_PINCODE, &g_settings.ci_save_pincode[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
}
} else { } else {
snprintf(str1, sizeof(str1), "%s %d", g_Locale->getText(LOCALE_CI_EMPTY), i); snprintf(str1, sizeof(str1), "%s %d", g_Locale->getText(LOCALE_CI_EMPTY), i);
tempMenu = new CMenuWidget(str1, NEUTRINO_ICON_SETTINGS); tempMenu = new CMenuWidget(str1, NEUTRINO_ICON_SETTINGS);
@@ -627,22 +623,28 @@ bool CCAMMenuHandler::changeNotify(const neutrino_locale_t OptionName, void * Da
return true; return true;
} }
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CI_RPR)) { else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CI_RPR)) {
printf("CCAMMenuHandler::changeNotify: ci_rpr[%d] %d\n", CISlot, g_settings.ci_rpr[CISlot]); for (unsigned int i = 0; i < ca->GetNumberCISlots(); i++) {
ca->SetCIRelevantPidsRouting(g_settings.ci_rpr[CISlot]); printf("CCAMMenuHandler::changeNotify: ci_rpr[%d] %d\n", i, g_settings.ci_rpr[i]);
ca->SetCIRelevantPidsRouting(g_settings.ci_rpr[i], i);
}
return true; return true;
} }
else else
#endif #endif
if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CI_CLOCK)) { if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CI_CLOCK)) {
printf("CCAMMenuHandler::changeNotify: ci_clock[%d] %d\n", CISlot, g_settings.ci_clock[CISlot]); for (unsigned int i = 0; i < ca->GetNumberCISlots(); i++) {
ca->SetTSClock(g_settings.ci_clock[CISlot] * 1000000); printf("CCAMMenuHandler::changeNotify: ci_clock[%d] %d\n", i, g_settings.ci_clock[i]);
ca->SetTSClock(g_settings.ci_clock[i] * 1000000, i);
}
return true; return true;
} }
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CI_SAVE_PINCODE)) { else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CI_SAVE_PINCODE)) {
int enabled = *(int *) Data; int enabled = *(int *) Data;
if (!enabled) { if (!enabled) {
printf("CCAMMenuHandler::changeNotify: clear saved pincode\n"); for (unsigned int i = 0; i < ca->GetNumberCISlots(); i++) {
g_settings.ci_pincode[CISlot].clear(); printf("CCAMMenuHandler::changeNotify: clear saved pincode[i]\n", i);
g_settings.ci_pincode[i].clear();
}
} }
} }
#if HAVE_LIBSTB_HAL #if HAVE_LIBSTB_HAL

6
src/zapit/src/zapit.cpp
View File

@@ -2595,16 +2595,16 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
// set ci clock to ZapStart_arg->ci_clock // set ci clock to ZapStart_arg->ci_clock
for (unsigned int i = 0; i < ca->GetNumberCISlots(); i++) { for (unsigned int i = 0; i < ca->GetNumberCISlots(); i++) {
ca->SetTSClock(ZapStart_arg->ci_clock[i] * 1000000); ca->SetTSClock(ZapStart_arg->ci_clock[i] * 1000000, i);
} }
#if BOXMODEL_VUPLUS #if BOXMODEL_VUPLUS
// dvb wait delay for ci response // dvb wait delay for ci response
ca->SetCIDelay(ZapStart_arg->ci_delay); ca->SetCIDelay(ZapStart_arg->ci_delay);
/// relevant pids routing // relevant pids routing
for (unsigned int i = 0; i < ca->GetNumberCISlots(); i++) { for (unsigned int i = 0; i < ca->GetNumberCISlots(); i++) {
ca->SetCIRelevantPidsRouting(ZapStart_arg->ci_rpr[i]); ca->SetCIRelevantPidsRouting(ZapStart_arg->ci_rpr[i], i);
} }
#endif #endif