mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix of "arm ci clock fix"

Browse Source
This commit is contained in:
GetAway
2020-01-01 11:24:55 +01:00
parent 6df729b954
commit eb9d9d8481
5 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/locale/deutsch.locale
View File

@@ -302,6 +302,8 @@ channellist.show_res_icon Auflösung signalisieren
channellist.since seit channellist.since seit
channellist.start Start channellist.start Start
ci.clock CI Takt (Mhz) ci.clock CI Takt (Mhz)
ci.clock_high hoch
ci.clock_normal normal
ci.empty Kein CAM im Slot ci.empty Kein CAM im Slot
ci.ignore_msg CA Meldungen ignorieren ci.ignore_msg CA Meldungen ignorieren
ci.init_failed CAM-Init fehlgeschlagen ci.init_failed CAM-Init fehlgeschlagen

2
data/locale/english.locale
View File

@@ -302,6 +302,8 @@ channellist.show_res_icon Signalize resolution
channellist.since since channellist.since since
channellist.start starts channellist.start starts
ci.clock CI clock (Mhz) ci.clock CI clock (Mhz)
ci.clock_high high
ci.clock_normal normal
ci.empty No CAM in slot ci.empty No CAM in slot
ci.ignore_msg Ignore CA messages ci.ignore_msg Ignore CA messages
ci.init_failed CAM init failed ci.init_failed CAM init failed

6
src/gui/cam_menu.cpp
View File

@@ -72,13 +72,13 @@ const CMenuOptionChooser::keyval OPTIONS_CI_MODE_OPTIONS[] =
{ 2, LOCALE_CI_MODE_2 } { 2, LOCALE_CI_MODE_2 }
}; };
#define OPTIONS_CI_MODE_OPTION_COUNT (sizeof(OPTIONS_CI_MODE_OPTIONS)/sizeof(CMenuOptionChooser::keyval)) #define OPTIONS_CI_MODE_OPTION_COUNT (sizeof(OPTIONS_CI_MODE_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
#endif
#define CI_CLOCK_OPTION_COUNT 2 #define CI_CLOCK_OPTION_COUNT 2
static const CMenuOptionChooser::keyval CI_CLOCK_OPTIONS[CI_CLOCK_OPTION_COUNT] = { static const CMenuOptionChooser::keyval CI_CLOCK_OPTIONS[CI_CLOCK_OPTION_COUNT] = {
{ 6, LOCALE_CI_CLOCK_NORMAL }, { 6, LOCALE_CI_CLOCK_NORMAL },
{ 7, LOCALE_CI_CLOCK_HIGH } { 7, LOCALE_CI_CLOCK_HIGH }
}; };
#endif
void CCAMMenuHandler::init(void) void CCAMMenuHandler::init(void)
{ {
hintBox = NULL; hintBox = NULL;
@@ -143,7 +143,7 @@ int CCAMMenuHandler::doMainMenu()
if(CiSlots) { 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)); 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 || HAVE_MIPS_HARDWARE #if HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_CLOCK, &g_settings.ci_clock, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this)); cammenu->addItem( new CMenuOptionChooser(LOCALE_CI_CLOCK, &g_settings.ci_clock, CI_CLOCK_OPTIONS, CI_CLOCK_OPTION_COUNT, true, this));
#else #else
cammenu->addItem( new CMenuOptionNumberChooser(LOCALE_CI_CLOCK, &g_settings.ci_clock, true, 6, 12, this)); cammenu->addItem( new CMenuOptionNumberChooser(LOCALE_CI_CLOCK, &g_settings.ci_clock, true, 6, 12, this));
#endif #endif

2
src/system/locals.h
View File

@@ -329,6 +329,8 @@ typedef enum
LOCALE_CHANNELLIST_SINCE, LOCALE_CHANNELLIST_SINCE,
LOCALE_CHANNELLIST_START, LOCALE_CHANNELLIST_START,
LOCALE_CI_CLOCK, LOCALE_CI_CLOCK,
LOCALE_CI_CLOCK_HIGH,
LOCALE_CI_CLOCK_NORMAL,
LOCALE_CI_EMPTY, LOCALE_CI_EMPTY,
LOCALE_CI_IGNORE_MSG, LOCALE_CI_IGNORE_MSG,
LOCALE_CI_INIT_FAILED, LOCALE_CI_INIT_FAILED,

2
src/system/locals_intern.h
View File

@@ -329,6 +329,8 @@ const char * locale_real_names[] =
"channellist.since", "channellist.since",
"channellist.start", "channellist.start",
"ci.clock", "ci.clock",
"ci.clock_high",
"ci.clock_normal",
"ci.empty", "ci.empty",
"ci.ignore_msg", "ci.ignore_msg",
"ci.init_failed", "ci.init_failed",