uimenu: Make the tables const

pull/61/head
Rene Stange 3 years ago
parent 4793816d22
commit 04221f057e
  1. 8
      src/uimenu.cpp
  2. 18
      src/uimenu.h

@ -31,13 +31,13 @@
using namespace std; using namespace std;
CUIMenu::TMenuItem CUIMenu::s_MenuRoot[] = const CUIMenu::TMenuItem CUIMenu::s_MenuRoot[] =
{ {
{"MiniDexed", MenuHandler, s_MainMenu}, {"MiniDexed", MenuHandler, s_MainMenu},
{0} {0}
}; };
CUIMenu::TMenuItem CUIMenu::s_MainMenu[] = const CUIMenu::TMenuItem CUIMenu::s_MainMenu[] =
{ {
{"TG1", MenuHandler, s_TGMenu, 0}, {"TG1", MenuHandler, s_TGMenu, 0},
#ifdef ARM_ALLOW_MULTI_CORE #ifdef ARM_ALLOW_MULTI_CORE
@ -52,7 +52,7 @@ CUIMenu::TMenuItem CUIMenu::s_MainMenu[] =
{0} {0}
}; };
CUIMenu::TMenuItem CUIMenu::s_TGMenu[] = const CUIMenu::TMenuItem CUIMenu::s_TGMenu[] =
{ {
{"Voice", EditProgramNumber}, {"Voice", EditProgramNumber},
{"Bank", EditVoiceBankNumber}, {"Bank", EditVoiceBankNumber},
@ -66,7 +66,7 @@ CUIMenu::TMenuItem CUIMenu::s_TGMenu[] =
}; };
// must match CMiniDexed::TTGParameter // must match CMiniDexed::TTGParameter
CUIMenu::TParameter CUIMenu::s_TGParameter[CMiniDexed::TGParameterUnknown] = const CUIMenu::TParameter CUIMenu::s_TGParameter[CMiniDexed::TGParameterUnknown] =
{ {
{0, CSysExFileLoader::MaxVoiceBankID, 1}, // TGParameterVoiceBank {0, CSysExFileLoader::MaxVoiceBankID, 1}, // TGParameterVoiceBank
{0, CSysExFileLoader::VoicesPerBank-1, 1}, // TGParameterProgram {0, CSysExFileLoader::VoicesPerBank-1, 1}, // TGParameterProgram

@ -57,7 +57,7 @@ private:
{ {
const char *Name; const char *Name;
TMenuHandler *Handler; TMenuHandler *Handler;
TMenuItem *MenuItem; const TMenuItem *MenuItem;
unsigned Parameter; unsigned Parameter;
}; };
@ -87,24 +87,24 @@ private:
CUserInterface *m_pUI; CUserInterface *m_pUI;
CMiniDexed *m_pMiniDexed; CMiniDexed *m_pMiniDexed;
TMenuItem *m_pParentMenu; const TMenuItem *m_pParentMenu;
TMenuItem *m_pCurrentMenu; const TMenuItem *m_pCurrentMenu;
unsigned m_nCurrentMenuItem; unsigned m_nCurrentMenuItem;
unsigned m_nCurrentSelection; unsigned m_nCurrentSelection;
unsigned m_nCurrentParameter; unsigned m_nCurrentParameter;
TMenuItem *m_MenuStackParent[MaxMenuDepth]; const TMenuItem *m_MenuStackParent[MaxMenuDepth];
TMenuItem *m_MenuStackMenu[MaxMenuDepth]; const TMenuItem *m_MenuStackMenu[MaxMenuDepth];
unsigned m_nMenuStackItem[MaxMenuDepth]; unsigned m_nMenuStackItem[MaxMenuDepth];
unsigned m_nMenuStackSelection[MaxMenuDepth]; unsigned m_nMenuStackSelection[MaxMenuDepth];
unsigned m_nMenuStackParameter[MaxMenuDepth]; unsigned m_nMenuStackParameter[MaxMenuDepth];
unsigned m_nCurrentMenuDepth; unsigned m_nCurrentMenuDepth;
static TMenuItem s_MenuRoot[]; static const TMenuItem s_MenuRoot[];
static TMenuItem s_MainMenu[]; static const TMenuItem s_MainMenu[];
static TMenuItem s_TGMenu[]; static const TMenuItem s_TGMenu[];
static TParameter s_TGParameter[]; static const TParameter s_TGParameter[];
}; };
#endif #endif

Loading…
Cancel
Save