mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 01:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

widget/menu.*: add keyval_ext type

Browse Source 
instead of adding unneeded default values to all menuchooser options
just to cater for two special cases, add an extra version that does
not need a locale setting but instead takes a char* instead.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@129 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2009-12-31 09:34:53 +00:00
parent 7a554d8f54
commit 7dcf8fe14d
12 changed files with 373 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/neutrino_menue.cpp
View File

@@ -241,7 +241,7 @@ const CMenuOptionChooser::keyval VIDEOMENU_43MODE_OPTIONS[VIDEOMENU_43MODE_OPTIO
/* numbers corresponding to video.cpp from zapit */
//#define VIDEOMENU_VIDEOMODE_OPTION_COUNT 11
const CMenuOptionChooser::keyval VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] =
const CMenuOptionChooser::keyval_ext VIDEOMENU_VIDEOMODE_OPTIONS[VIDEOMENU_VIDEOMODE_OPTION_COUNT] =
{
{ 1, NONEXISTANT_LOCALE, "SECAM" },
{ 2, NONEXISTANT_LOCALE, "PAL" },
@@ -818,13 +818,13 @@ const CMenuOptionChooser::keyval SCANTS_ZAPIT_SCANTYPE[SCANTS_ZAPIT_SCANTYPE_COU
#define SATSETUP_DISEQC_OPTION_COUNT 6
const CMenuOptionChooser::keyval SATSETUP_DISEQC_OPTIONS[SATSETUP_DISEQC_OPTION_COUNT] =
{
{ NO_DISEQC , LOCALE_SATSETUP_NODISEQC, NULL },
{ MINI_DISEQC , LOCALE_SATSETUP_MINIDISEQC, NULL },
{ DISEQC_1_0 , LOCALE_SATSETUP_DISEQC10, NULL },
{ DISEQC_1_1 , LOCALE_SATSETUP_DISEQC11, NULL },
/*{ DISEQC_1_2 , LOCALE_SATSETUP_DISEQC12, NULL },*/
{ DISEQC_ADVANCED , LOCALE_SATSETUP_DISEQ_ADVANCED, NULL },
{ SMATV_REMOTE_TUNING, LOCALE_SATSETUP_SMATVREMOTE, NULL }
{ NO_DISEQC, LOCALE_SATSETUP_NODISEQC },
{ MINI_DISEQC, LOCALE_SATSETUP_MINIDISEQC },
{ DISEQC_1_0, LOCALE_SATSETUP_DISEQC10 },
{ DISEQC_1_1, LOCALE_SATSETUP_DISEQC11 },
/*{ DISEQC_1_2, LOCALE_SATSETUP_DISEQC12 },*/
{ DISEQC_ADVANCED, LOCALE_SATSETUP_DISEQ_ADVANCED },
{ SMATV_REMOTE_TUNING, LOCALE_SATSETUP_SMATVREMOTE }
};
#define SATSETUP_SCANTP_FEC_COUNT 23
@@ -1453,9 +1453,9 @@ const CMenuOptionChooser::keyval CHANNELLIST_EPGTEXT_ALIGN_RIGHT_OPTIONS[CHANNE
};
#define CPU_FREQ_OPTION_COUNT 13
const CMenuOptionChooser::keyval CPU_FREQ_OPTIONS[CPU_FREQ_OPTION_COUNT] =
const CMenuOptionChooser::keyval_ext CPU_FREQ_OPTIONS[CPU_FREQ_OPTION_COUNT] =
{
{ 0, LOCALE_CPU_FREQ_DEFAULT },
{ 0, LOCALE_CPU_FREQ_DEFAULT, NULL },
{ 50, NONEXISTANT_LOCALE, "50 Mhz"},
{ 100, NONEXISTANT_LOCALE, "100 Mhz"},
{ 150, NONEXISTANT_LOCALE, "150 Mhz"},