wirtz
/
MiniDexed
mirror of https://github.com/probonopd/MiniDexed
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve menu structure

Browse Source
unison
probonopd 1 week ago
parent c55fa12135
commit 5b66c8dd70
2 changed files with 22 additions and 14 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 16
      src/uimenu.cpp
  2. 20
      src/uimenu.h

16
src/uimenu.cpp
Unescape View File

@ -81,9 +81,7 @@ const CUIMenu::TMenuItem CUIMenu::s_TGMenu[] =
{"Detune", EditTGParameter, 0, CMiniDexed::TGParameterMasterTune}, {"Detune", EditTGParameter, 0, CMiniDexed::TGParameterMasterTune},
{"Cutoff", EditTGParameter, 0, CMiniDexed::TGParameterCutoff}, {"Cutoff", EditTGParameter, 0, CMiniDexed::TGParameterCutoff},
{"Resonance", EditTGParameter, 0, CMiniDexed::TGParameterResonance}, {"Resonance", EditTGParameter, 0, CMiniDexed::TGParameterResonance},
{"Unison Voices", EditTGParameter, 0, CMiniDexed::TGParameterUnisonVoices}, {"Unison", MenuHandler, s_UnisonMenu},
{"Unison Detune", EditTGParameter, 0, CMiniDexed::TGParameterUnisonDetune},
{"Unison Spread", EditTGParameter, 0, CMiniDexed::TGParameterUnisonSpread},
{"Pitch Bend", MenuHandler, s_EditPitchBendMenu}, {"Pitch Bend", MenuHandler, s_EditPitchBendMenu},
{"Portamento", MenuHandler, s_EditPortamentoMenu}, {"Portamento", MenuHandler, s_EditPortamentoMenu},
{"Poly/Mono", EditTGParameter, 0, CMiniDexed::TGParameterMonoMode}, {"Poly/Mono", EditTGParameter, 0, CMiniDexed::TGParameterMonoMode},
@ -93,6 +91,14 @@ const CUIMenu::TMenuItem CUIMenu::s_TGMenu[] =
{0} {0}
}; };
const CUIMenu::TMenuItem CUIMenu::s_UnisonMenu[] =
{
{"Voices", EditTGParameter, 0, CMiniDexed::TGParameterUnisonVoices},
{"Detune", EditTGParameter, 0, CMiniDexed::TGParameterUnisonDetune},
{"Spread", EditTGParameter, 0, CMiniDexed::TGParameterUnisonSpread},
{0}
};
const CUIMenu::TMenuItem CUIMenu::s_EffectsMenu[] = const CUIMenu::TMenuItem CUIMenu::s_EffectsMenu[] =
{ {
{"Compress", EditGlobalParameter, 0, CMiniDexed::ParameterCompressorEnable}, {"Compress", EditGlobalParameter, 0, CMiniDexed::ParameterCompressorEnable},
@ -1104,7 +1110,7 @@ string CUIMenu::GetOPValueString (unsigned nOPParameter, int nValue)
string CUIMenu::ToVolume (int nValue) string CUIMenu::ToVolume (int nValue)
{ {
static const size_t MaxChars = CConfig::LCDColumns-2; static const std::size_t MaxChars = CConfig::LCDColumns-2;
char VolumeBar[MaxChars+1]; char VolumeBar[MaxChars+1];
memset (VolumeBar, 0xFF, sizeof VolumeBar); // 0xFF is the block character memset (VolumeBar, 0xFF, sizeof VolumeBar); // 0xFF is the block character
VolumeBar[nValue * MaxChars / 127] = '\0'; VolumeBar[nValue * MaxChars / 127] = '\0';
@ -1115,7 +1121,7 @@ string CUIMenu::ToVolume (int nValue)
string CUIMenu::ToPan (int nValue) string CUIMenu::ToPan (int nValue)
{ {
assert (CConfig::LCDColumns == 16); assert (CConfig::LCDColumns == 16);
static const size_t MaxChars = CConfig::LCDColumns-3; static const std::size_t MaxChars = CConfig::LCDColumns-3;
char PanMarker[MaxChars+1] = "......:......"; char PanMarker[MaxChars+1] = "......:......";
unsigned nIndex = nValue * MaxChars / 127; unsigned nIndex = nValue * MaxChars / 127;
if (nIndex == MaxChars) if (nIndex == MaxChars)

20
src/uimenu.h
Unescape View File

@ -57,11 +57,6 @@ public:
}; };
public: public:
CUIMenu (CUserInterface *pUI, CMiniDexed *pMiniDexed, CConfig *pConfig);
void EventHandler (TMenuEvent Event);
private:
typedef void TMenuHandler (CUIMenu *pUIMenu, TMenuEvent Event); typedef void TMenuHandler (CUIMenu *pUIMenu, TMenuEvent Event);
struct TMenuItem struct TMenuItem
@ -72,6 +67,17 @@ private:
unsigned Parameter; unsigned Parameter;
}; };
static const TMenuItem s_UnisonMenu[];
static void EditTGParameter(CUIMenu *pUIMenu, TMenuEvent Event);
static void EditVoiceParameter(CUIMenu *pUIMenu, TMenuEvent Event);
static void EditOPParameter(CUIMenu *pUIMenu, TMenuEvent Event);
static void SavePerformance(CUIMenu *pUIMenu, TMenuEvent Event);
public:
CUIMenu(CUserInterface *pUI, CMiniDexed *pMiniDexed, CConfig *pConfig);
void EventHandler(TMenuEvent Event);
private:
typedef std::string TToString (int nValue); typedef std::string TToString (int nValue);
struct TParameter struct TParameter
@ -87,10 +93,6 @@ private:
static void EditGlobalParameter (CUIMenu *pUIMenu, TMenuEvent Event); static void EditGlobalParameter (CUIMenu *pUIMenu, TMenuEvent Event);
static void EditVoiceBankNumber (CUIMenu *pUIMenu, TMenuEvent Event); static void EditVoiceBankNumber (CUIMenu *pUIMenu, TMenuEvent Event);
static void EditProgramNumber (CUIMenu *pUIMenu, TMenuEvent Event); static void EditProgramNumber (CUIMenu *pUIMenu, TMenuEvent Event);
static void EditTGParameter (CUIMenu *pUIMenu, TMenuEvent Event);
static void EditVoiceParameter (CUIMenu *pUIMenu, TMenuEvent Event);
static void EditOPParameter (CUIMenu *pUIMenu, TMenuEvent Event);
static void SavePerformance (CUIMenu *pUIMenu, TMenuEvent Event);
static void EditTGParameter2 (CUIMenu *pUIMenu, TMenuEvent Event); static void EditTGParameter2 (CUIMenu *pUIMenu, TMenuEvent Event);
static void EditTGParameterModulation (CUIMenu *pUIMenu, TMenuEvent Event); static void EditTGParameterModulation (CUIMenu *pUIMenu, TMenuEvent Event);
static void PerformanceMenu (CUIMenu *pUIMenu, TMenuEvent Event); static void PerformanceMenu (CUIMenu *pUIMenu, TMenuEvent Event);

Write Preview
Loading…
Cancel
Save