From cf032199c7ab354a4f1e49787bb6085ef4b8c0c3 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Tue, 8 Feb 2022 19:04:45 +0100 Subject: [PATCH] - osd-setup: auto-calc some structs Signed-off-by: Thilo Graf --- src/gui/osd_setup.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 6ab51af08..5d1181a4e 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -1171,8 +1171,7 @@ void COsdSetup::showOsdTimeoutSetup(CMenuWidget* menu_timeout) menu_timeout->addItem(new CMenuForwarder(LOCALE_OPTIONS_DEFAULT, true, NULL, this, "osd.def", CRCInput::RC_red)); } -#define LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS_COUNT 7 -const CMenuOptionChooser::keyval LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS[LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS_COUNT]= +const CMenuOptionChooser::keyval LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS[]= { { 0 , LOCALE_MISCSETTINGS_INFOBAR_DISP_0 }, { 1 , LOCALE_MISCSETTINGS_INFOBAR_DISP_1 }, @@ -1182,15 +1181,16 @@ const CMenuOptionChooser::keyval LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS[LOCALE { 5 , LOCALE_MISCSETTINGS_INFOBAR_DISP_5 }, { 6 , LOCALE_MISCSETTINGS_INFOBAR_DISP_6 } }; +#define LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS_COUNT (sizeof(LOCALE_MISCSETTINGS_INFOBAR_DISP_OPTIONS) / sizeof(CMenuOptionChooser::keyval)) -#define PROGRESSBAR_INFOBAR_POSITION_COUNT 4 -const CMenuOptionChooser::keyval PROGRESSBAR_INFOBAR_POSITION_OPTIONS[PROGRESSBAR_INFOBAR_POSITION_COUNT]= +const CMenuOptionChooser::keyval PROGRESSBAR_INFOBAR_POSITION_OPTIONS[]= { { 0 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_0 }, { 1 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_1 }, { 2 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_2 }, { 3 , LOCALE_MISCSETTINGS_PROGRESSBAR_INFOBAR_POSITION_3 } }; +#define PROGRESSBAR_INFOBAR_POSITION_COUNT (sizeof(PROGRESSBAR_INFOBAR_POSITION_OPTIONS) / sizeof(CMenuOptionChooser::keyval)) // menus void COsdSetup::showOsdMenusSetup(CMenuWidget *menu_menus)