diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 3c652fcf4..6b15d0e82 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -325,6 +325,7 @@ channellist.show_infobox Sendungsfenster anzeigen channellist.show_res_icon Auflösung signalisieren channellist.since seit channellist.start Start +ci.check_live_slot CI-Slot auf Live-TV Nutzung prüfen ci.clock CI Takt (Mhz) ci.clock_extra_high extra hoch ci.clock_high hoch diff --git a/data/locale/english.locale b/data/locale/english.locale index d73812e28..6d2dd013a 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -325,6 +325,7 @@ channellist.show_infobox Show bottom infobox channellist.show_res_icon Signalize resolution channellist.since since channellist.start starts +ci.check_live_slot Check CI-slot for live-tv use ci.clock CI clock (Mhz) ci.clock_extra_high extra high ci.clock_high high diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp index 85693083b..0f204eb53 100644 --- a/src/gui/cam_menu.cpp +++ b/src/gui/cam_menu.cpp @@ -168,6 +168,7 @@ int CCAMMenuHandler::doMainMenu() } 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)); + 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)); //NI cammenu->addItem(new CMenuOptionChooser(LOCALE_CI_REC_ZAPTO, &g_settings.ci_rec_zapto, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); CMenuOptionChooser *ci_mode = new CMenuOptionChooser(LOCALE_CI_MODE, &g_settings.ci_mode, OPTIONS_CI_MODE_OPTIONS, OPTIONS_CI_MODE_OPTION_COUNT, true, NULL); @@ -629,6 +630,9 @@ bool CCAMMenuHandler::changeNotify(const neutrino_locale_t OptionName, void * Da g_settings.ci_pincode.clear(); } } + else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CI_CHECK_LIVE_SLOT)) { + ca->setCheckLiveSlot(g_settings.ci_check_live); + } else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CI_TUNER)) { printf("CCAMMenuHandler::changeNotify: bind CI to tuner %d\n", g_settings.ci_tuner); CCamManager::getInstance()->SetCITuner(g_settings.ci_tuner); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 35b858214..0ea0f5467 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -492,6 +492,7 @@ int CNeutrinoApp::loadSetup(const char * fname) #endif g_settings.ci_ignore_messages = configfile.getInt32("ci_ignore_messages", 0); g_settings.ci_save_pincode = configfile.getInt32("ci_save_pincode", 0); + g_settings.ci_check_live = configfile.getInt32("ci_check_live", 0); g_settings.ci_pincode = configfile.getString("ci_pincode", ""); g_settings.ci_tuner = configfile.getInt32("ci_tuner", -1); g_settings.ci_rec_zapto = configfile.getInt32("ci_rec_zapto", 0); //NI @@ -1483,6 +1484,7 @@ void CNeutrinoApp::saveSetup(const char * fname) #endif configfile.setInt32("ci_ignore_messages", g_settings.ci_ignore_messages); configfile.setInt32("ci_save_pincode", g_settings.ci_save_pincode); + configfile.setInt32("ci_check_live", g_settings.ci_check_live); configfile.setString("ci_pincode", g_settings.ci_pincode); configfile.setInt32("ci_tuner", g_settings.ci_tuner); configfile.setInt32("ci_rec_zapto", g_settings.ci_rec_zapto); //NI @@ -2939,6 +2941,7 @@ TIMER_START(); delete hintBox; cCA::GetInstance()->Ready(true); + cCA::GetInstance()->setCheckLiveSlot(g_settings.ci_check_live); //InitZapper(); SHTDCNT::getInstance()->init(); diff --git a/src/system/locals.h b/src/system/locals.h index 6ef9ca351..c0dc39b72 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -352,6 +352,7 @@ typedef enum LOCALE_CHANNELLIST_SHOW_RES_ICON, LOCALE_CHANNELLIST_SINCE, LOCALE_CHANNELLIST_START, + LOCALE_CI_CHECK_LIVE_SLOT, LOCALE_CI_CLOCK, LOCALE_CI_CLOCK_EXTRA_HIGH, LOCALE_CI_CLOCK_HIGH, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index c6de995d0..1fbfd571b 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -352,6 +352,7 @@ const char * locale_real_names[] = "channellist.show_res_icon", "channellist.since", "channellist.start", + "ci.check_live_slot", "ci.clock", "ci.clock_extra_high", "ci.clock_high", diff --git a/src/system/settings.h b/src/system/settings.h index c60bf14e1..8b6e96229 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -291,6 +291,7 @@ struct SNeutrinoSettings #endif int ci_ignore_messages; int ci_save_pincode; + int ci_check_live; int ci_tuner; int ci_rec_zapto; //NI int ci_mode; //NI