diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 58469f35b..73f5d3418 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -320,6 +320,8 @@ channellist.show_res_icon Auflösung signalisieren channellist.since seit channellist.start Start ci.clock CI Takt (Mhz) +ci.clock_high hoch +ci.clock_normal normal ci.empty Kein CAM im Slot ci.ignore_msg CA Meldungen ignorieren ci.init_failed CAM-Init fehlgeschlagen diff --git a/data/locale/english.locale b/data/locale/english.locale index dd06bf8c0..53e64f95d 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -320,6 +320,8 @@ channellist.show_res_icon Signalize resolution channellist.since since channellist.start starts ci.clock CI clock (Mhz) +ci.clock_high high +ci.clock_normal normal ci.empty No CAM in slot ci.ignore_msg Ignore CA messages ci.init_failed CAM init failed diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp index 079c56534..56138932f 100644 --- a/src/gui/cam_menu.cpp +++ b/src/gui/cam_menu.cpp @@ -73,6 +73,12 @@ const CMenuOptionChooser::keyval OPTIONS_CI_MODE_OPTIONS[] = }; #define OPTIONS_CI_MODE_OPTION_COUNT (sizeof(OPTIONS_CI_MODE_OPTIONS)/sizeof(CMenuOptionChooser::keyval)) +#define CI_CLOCK_OPTION_COUNT 2 +static const CMenuOptionChooser::keyval CI_CLOCK_OPTIONS[CI_CLOCK_OPTION_COUNT] = { + { 6, LOCALE_CI_CLOCK_NORMAL }, + { 7, LOCALE_CI_CLOCK_HIGH } +}; + void CCAMMenuHandler::init(void) { hintBox = NULL; @@ -136,7 +142,11 @@ int CCAMMenuHandler::doMainMenu() int CiSlots = ca ? ca->GetNumberCISlots() : 0; if(CiSlots) { 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 + 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)); diff --git a/src/neutrino.cpp b/src/neutrino.cpp index e26841ced..983d03aab 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -465,7 +465,11 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.standby_cpufreq = configfile.getInt32("standby_cpufreq", 100); g_settings.rounded_corners = configfile.getInt32("rounded_corners", 0); //NI g_settings.ci_standby_reset = configfile.getInt32("ci_standby_reset", 0); +#if HAVE_ARM_HARDWARE + g_settings.ci_clock = configfile.getInt32("ci_clock", 6); +#else g_settings.ci_clock = configfile.getInt32("ci_clock", 9); +#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_pincode = configfile.getString("ci_pincode", ""); diff --git a/src/system/locals.h b/src/system/locals.h index b3a053d26..a23c39ff9 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -347,6 +347,8 @@ typedef enum LOCALE_CHANNELLIST_SINCE, LOCALE_CHANNELLIST_START, LOCALE_CI_CLOCK, + LOCALE_CI_CLOCK_HIGH, + LOCALE_CI_CLOCK_NORMAL, LOCALE_CI_EMPTY, LOCALE_CI_IGNORE_MSG, LOCALE_CI_INIT_FAILED, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 65a696a31..fd6b4d073 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -347,6 +347,8 @@ const char * locale_real_names[] = "channellist.since", "channellist.start", "ci.clock", + "ci.clock_high", + "ci.clock_normal", "ci.empty", "ci.ignore_msg", "ci.init_failed",