diff --git a/src/gui/cam_menu.cpp b/src/gui/cam_menu.cpp index 33ced70d1..cda80058f 100644 --- a/src/gui/cam_menu.cpp +++ b/src/gui/cam_menu.cpp @@ -96,13 +96,6 @@ printf("CCAMMenuHandler::exec: actionkey %s\n", actionkey.c_str()); return doMainMenu (); } -#define OPTIONS_OFF0_ON1_OPTION_COUNT 2 -const CMenuOptionChooser::keyval OPTIONS_OFF0_ON1_OPTIONS[OPTIONS_OFF0_ON1_OPTION_COUNT] = -{ - { 0, LOCALE_OPTIONS_OFF }, - { 1, LOCALE_OPTIONS_ON } -}; - int CCAMMenuHandler::doMainMenu () { int ret; diff --git a/src/mymenu.h b/src/mymenu.h index b64567043..645d9116f 100644 --- a/src/mymenu.h +++ b/src/mymenu.h @@ -1,3 +1,17 @@ +#define OPTIONS_OFF0_ON1_OPTION_COUNT 2 +const CMenuOptionChooser::keyval OPTIONS_OFF0_ON1_OPTIONS[OPTIONS_OFF0_ON1_OPTION_COUNT] = +{ + { 0, LOCALE_OPTIONS_OFF }, + { 1, LOCALE_OPTIONS_ON } +}; + +#define OPTIONS_OFF1_ON0_OPTION_COUNT 2 +const CMenuOptionChooser::keyval OPTIONS_OFF1_ON0_OPTIONS[OPTIONS_OFF1_ON0_OPTION_COUNT] = +{ + { 1, LOCALE_OPTIONS_OFF }, + { 0, LOCALE_OPTIONS_ON } +}; + #define SCANMODE_OPTION_COUNT 3 const CMenuOptionChooser::keyval SCANMODE_OPTIONS[SCANMODE_OPTION_COUNT] = { diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 6cfc3f0a0..7eaf65e9d 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -165,20 +165,6 @@ static CTimingSettingsNotifier timingsettingsnotifier; int safe_mkdir(char * path); -#define OPTIONS_OFF0_ON1_OPTION_COUNT 2 -const CMenuOptionChooser::keyval OPTIONS_OFF0_ON1_OPTIONS[OPTIONS_OFF0_ON1_OPTION_COUNT] = -{ - { 0, LOCALE_OPTIONS_OFF }, - { 1, LOCALE_OPTIONS_ON } -}; - -#define OPTIONS_OFF1_ON0_OPTION_COUNT 2 -const CMenuOptionChooser::keyval OPTIONS_OFF1_ON0_OPTIONS[OPTIONS_OFF1_ON0_OPTION_COUNT] = -{ - { 1, LOCALE_OPTIONS_OFF }, - { 0, LOCALE_OPTIONS_ON } -}; - #define VIDEOMENU_VIDEOSIGNAL_HD1_OPTION_COUNT 8 const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_HD1_OPTIONS[VIDEOMENU_VIDEOSIGNAL_HD1_OPTION_COUNT] = {