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

move ci save pin code to each slot menu (but still only valid for slot 0)

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: bfab1febdb
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:12 +01:00
committed by vanhofen
parent 52fc28969b
commit 7c99f1e0c1
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/cam_menu.cpp
View File

@@ -163,7 +163,6 @@ int CCAMMenuHandler::doMainMenu()
#endif #endif
cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_RESET_STANDBY, &g_settings.ci_standby_reset, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true)); cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_RESET_STANDBY, &g_settings.ci_standby_reset, 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));
#if HAVE_LIBSTB_HAL #if HAVE_LIBSTB_HAL
cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_CHECK_LIVE_SLOT, &g_settings.ci_check_live, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_CHECK_LIVE_SLOT, &g_settings.ci_check_live, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this));
#endif #endif
@@ -222,6 +221,7 @@ if (i == 0) { // only for slot 0 valid - fix later
#endif #endif
cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_RPR, &g_settings.ci_rpr[i], OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_RPR, &g_settings.ci_rpr[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_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 { } 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);
@@ -489,16 +489,16 @@ int CCAMMenuHandler::handleCamMsg(const neutrino_msg_t msg, neutrino_msg_data_t
std::string ENQAnswer; std::string ENQAnswer;
if (/* !from_menu && */ g_settings.ci_save_pincode && pMmiEnquiry->blind != 0 && (int) g_settings.ci_pincode.length() == pMmiEnquiry->answerlen) { if (/* !from_menu && */ g_settings.ci_save_pincode[curslot] && pMmiEnquiry->blind != 0 && (int) g_settings.ci_pincode[curslot].length() == pMmiEnquiry->answerlen) {
static int acount = 0; static int acount = 0;
static time_t last_ask = 0; static time_t last_ask = 0;
ENQAnswer = g_settings.ci_pincode; ENQAnswer = g_settings.ci_pincode[curslot];
printf("CCAMMenuHandler::handleCamMsg: using saved answer [%s] (#%d, time diff %d)\n", ENQAnswer.c_str(), acount, (int) (time_monotonic() - last_ask)); printf("CCAMMenuHandler::handleCamMsg: using saved answer [%s] (#%d, time diff %d)\n", ENQAnswer.c_str(), acount, (int) (time_monotonic() - last_ask));
if ((time_monotonic() - last_ask) < 10) { if ((time_monotonic() - last_ask) < 10) {
acount++; acount++;
if (acount > 4) if (acount > 4)
g_settings.ci_pincode.clear(); g_settings.ci_pincode[curslot].clear();
} else { } else {
last_ask = time_monotonic(); last_ask = time_monotonic();
acount = 0; acount = 0;
@@ -507,7 +507,7 @@ int CCAMMenuHandler::handleCamMsg(const neutrino_msg_t msg, neutrino_msg_data_t
CEnquiryInput *Inquiry = new CEnquiryInput((char *)convertDVBUTF8(pMmiEnquiry->enquiryText, strlen(pMmiEnquiry->enquiryText), 0).c_str(), &ENQAnswer, pMmiEnquiry->answerlen, pMmiEnquiry->blind != 0, NONEXISTANT_LOCALE); CEnquiryInput *Inquiry = new CEnquiryInput((char *)convertDVBUTF8(pMmiEnquiry->enquiryText, strlen(pMmiEnquiry->enquiryText), 0).c_str(), &ENQAnswer, pMmiEnquiry->answerlen, pMmiEnquiry->blind != 0, NONEXISTANT_LOCALE);
Inquiry->exec(NULL, ""); Inquiry->exec(NULL, "");
delete Inquiry; delete Inquiry;
g_settings.ci_pincode = ENQAnswer; g_settings.ci_pincode[curslot] = ENQAnswer;
} }
printf("CCAMMenuHandler::handleCamMsg: input=[%s]\n", ENQAnswer.c_str()); printf("CCAMMenuHandler::handleCamMsg: input=[%s]\n", ENQAnswer.c_str());
@@ -640,7 +640,7 @@ bool CCAMMenuHandler::changeNotify(const neutrino_locale_t OptionName, void * Da
int enabled = *(int *) Data; int enabled = *(int *) Data;
if (!enabled) { if (!enabled) {
printf("CCAMMenuHandler::changeNotify: clear saved pincode\n"); printf("CCAMMenuHandler::changeNotify: clear saved pincode\n");
g_settings.ci_pincode.clear(); g_settings.ci_pincode[CISlot].clear();
} }
} }
#if HAVE_LIBSTB_HAL #if HAVE_LIBSTB_HAL

13
src/neutrino.cpp
View File

@@ -505,10 +505,12 @@ int CNeutrinoApp::loadSetup(const char * fname)
for (int i = 0; i < cCA::GetInstance()->GetNumberCISlots(); i++) { for (int i = 0; i < cCA::GetInstance()->GetNumberCISlots(); i++) {
sprintf(cfg_key, "ci_ignore_messages_%d", i); sprintf(cfg_key, "ci_ignore_messages_%d", i);
g_settings.ci_ignore_messages[i] = configfile.getInt32(cfg_key, 0); g_settings.ci_ignore_messages[i] = configfile.getInt32(cfg_key, 0);
sprintf(cfg_key, "ci_save_pincode_%d", i);
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, "");
} }
g_settings.ci_save_pincode = configfile.getInt32("ci_save_pincode", 0); // TODO: for each slot
g_settings.ci_check_live = configfile.getInt32("ci_check_live", 0); g_settings.ci_check_live = configfile.getInt32("ci_check_live", 0);
g_settings.ci_pincode = configfile.getString("ci_pincode", ""); // TODO: for each slot
g_settings.ci_tuner = configfile.getInt32("ci_tuner", -1); g_settings.ci_tuner = configfile.getInt32("ci_tuner", -1);
g_settings.ci_rec_zapto = configfile.getInt32("ci_rec_zapto", 0); //NI g_settings.ci_rec_zapto = configfile.getInt32("ci_rec_zapto", 0); //NI
g_settings.ci_mode = configfile.getInt32("ci_mode", 0); //NI g_settings.ci_mode = configfile.getInt32("ci_mode", 0); //NI
@@ -1508,10 +1510,13 @@ void CNeutrinoApp::saveSetup(const char * fname)
for (int i = 0; i < cCA::GetInstance()->GetNumberCISlots(); i++) { for (int i = 0; i < cCA::GetInstance()->GetNumberCISlots(); i++) {
sprintf(cfg_key, "ci_ignore_messages_%d", i); sprintf(cfg_key, "ci_ignore_messages_%d", i);
configfile.setInt32(cfg_key, g_settings.ci_ignore_messages[i]); configfile.setInt32(cfg_key, g_settings.ci_ignore_messages[i]);
sprintf(cfg_key, "ci_save_pincode_%d", i);
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]);
} }
configfile.setInt32("ci_save_pincode", g_settings.ci_save_pincode); // TODO: for each slot
configfile.setInt32("ci_check_live", g_settings.ci_check_live); configfile.setInt32("ci_check_live", g_settings.ci_check_live);
configfile.setString("ci_pincode", g_settings.ci_pincode); // TODO: for each slot
configfile.setInt32("ci_tuner", g_settings.ci_tuner); configfile.setInt32("ci_tuner", g_settings.ci_tuner);
configfile.setInt32("ci_rec_zapto", g_settings.ci_rec_zapto); //NI configfile.setInt32("ci_rec_zapto", g_settings.ci_rec_zapto); //NI
configfile.setInt32("ci_mode", g_settings.ci_mode); //NI configfile.setInt32("ci_mode", g_settings.ci_mode); //NI

5
src/system/settings.h
View File

@@ -291,12 +291,13 @@ struct SNeutrinoSettings
int ci_rpr[4]; int ci_rpr[4];
#endif #endif
int ci_ignore_messages[4]; int ci_ignore_messages[4];
int ci_save_pincode; // TODO: for each slot int ci_save_pincode[4];
std::string ci_pincode[4];
int ci_check_live; int ci_check_live;
int ci_tuner; int ci_tuner;
int ci_rec_zapto; //NI int ci_rec_zapto; //NI
int ci_mode; //NI int ci_mode; //NI
std::string ci_pincode; // TODO: for each slot
int radiotext_enable; int radiotext_enable;
int webradio_xml_auto; int webradio_xml_auto;
int webtv_xml_auto; int webtv_xml_auto;