From 0d1ee0dbca8b85a01a03efb9cdc8a88ae20be7c1 Mon Sep 17 00:00:00 2001 From: BPanther Date: Wed, 30 Apr 2025 12:24:17 +0200 Subject: [PATCH] ci init changed, new slot option added Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/672e40c0deaa154cc1423782b0fb8665af02fe3c Author: BPanther Date: 2025-04-30 (Wed, 30 Apr 2025) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/cam_menu.cpp | 2 +- src/neutrino.cpp | 5 +++++ src/system/settings.h | 1 + src/zapit/include/zapit/zapit.h | 1 + src/zapit/src/zapit.cpp | 5 +++++ 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp index 2abf70373..dce9c8e51 100644 --- a/src/gui/cam_menu.cpp +++ b/src/gui/cam_menu.cpp @@ -206,7 +206,6 @@ int CCAMMenuHandler::doMainMenu() printf("CCAMMenuHandler::doMainMenu cam%d name %s\n", i, name1); char tmp[32]; snprintf(tmp, sizeof(tmp), "ca_ci%d", i); - cammenu->addItem(new CMenuForwarder(name1, true, NULL, this, tmp, CRCInput::RC_1 + cnt++)); snprintf(tmp, sizeof(tmp), "ca_ci_reset%d", i); cammenu->addItem(new CMenuForwarder(LOCALE_CI_RESET, true, NULL, this, tmp)); @@ -219,6 +218,7 @@ int CCAMMenuHandler::doMainMenu() #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("Operator-Profile"/*LOCALE_CI_OP*/, &g_settings.ci_op[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); 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)); } else { diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 911e33a02..c0faa6518 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -582,6 +582,8 @@ int CNeutrinoApp::loadSetup(const char *fname) g_settings.ci_save_pincode[i] = configfile.getInt32(cfg_key, 0); sprintf(cfg_key, "ci_pincode_%d", i); g_settings.ci_pincode[i] = configfile.getString(cfg_key, ""); + sprintf(cfg_key, "ci_op_%d", i); + g_settings.ci_op[i] = configfile.getInt32(cfg_key, 0); sprintf(cfg_key, "ci_clock_%d", i); #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE g_settings.ci_clock[i] = configfile.getInt32(cfg_key, 6); @@ -1661,6 +1663,8 @@ void CNeutrinoApp::saveSetup(const char *fname) configfile.setInt32(cfg_key, g_settings.ci_save_pincode[i]); sprintf(cfg_key, "ci_pincode_%d", i); configfile.setString(cfg_key, g_settings.ci_pincode[i]); + sprintf(cfg_key, "ci_op_%d", i); + configfile.setInt32(cfg_key, g_settings.ci_op[i]); sprintf(cfg_key, "ci_clock_%d", i); configfile.setInt32(cfg_key, g_settings.ci_clock[i]); #if BOXMODEL_VUPLUS_ALL @@ -2995,6 +2999,7 @@ TIMER_START(); ZapStart_arg.ci_delay = g_settings.ci_delay; memcpy(ZapStart_arg.ci_rpr, g_settings.ci_rpr, sizeof(g_settings.ci_rpr)); #endif + memcpy(ZapStart_arg.ci_op, g_settings.ci_op, sizeof(g_settings.ci_op)); ZapStart_arg.volume = g_settings.current_volume; ZapStart_arg.webtv_xml = &g_settings.webtv_xml; ZapStart_arg.webradio_xml = &g_settings.webradio_xml; diff --git a/src/system/settings.h b/src/system/settings.h index e51013e97..fad617030 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -427,6 +427,7 @@ struct SNeutrinoSettings int ci_ignore_messages[4]; int ci_save_pincode[4]; std::string ci_pincode[4]; + int ci_op[4]; int ci_clock[4]; #if BOXMODEL_VUPLUS_ALL int ci_rpr[4]; diff --git a/src/zapit/include/zapit/zapit.h b/src/zapit/include/zapit/zapit.h index 581e51855..37edbf0cd 100644 --- a/src/zapit/include/zapit/zapit.h +++ b/src/zapit/include/zapit/zapit.h @@ -48,6 +48,7 @@ typedef struct ZAPIT_start_arg uint32_t osd_resolution; int volume; int ci_clock[4]; + int ci_op[4]; #if BOXMODEL_VUPLUS_ALL int ci_delay; int ci_rpr[4]; diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index bd8a6db97..6e856066f 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -2816,6 +2816,11 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg) } #endif + // ci operator mode + for (unsigned int i = 0; i < ca->GetNumberCISlots(); i++) { + ca->SetCIOperator(ZapStart_arg->ci_op[i], i); + } + ca->Start(); eventServer = new CEventServer;