mirror of
https://codeberg.org/armin/sm-26.git
synced 2026-10-11 17:01:53 +02:00
Expand preset bank to 128 categorized presets, shorten sync delays, add menu UI polish and hold-to-repeat nav
This commit is contained in:
Armin
parent
1a36b5baf0
commit
78e8ee80ad
10 changed files with 761 additions and 413 deletions
|
|
@ -10,9 +10,9 @@ static juce::String padRight (const juce::String& s, int width)
|
|||
SM26AudioProcessorEditor::SM26AudioProcessorEditor (SM26AudioProcessor& p)
|
||||
: AudioProcessorEditor (p), proc (p)
|
||||
{
|
||||
setSize (920, 540);
|
||||
setSize (920, 680);
|
||||
setResizable (true, false);
|
||||
setResizeLimits (720, 400, 1400, 900);
|
||||
setResizeLimits (760, 620, 1500, 1300);
|
||||
|
||||
addAndMakeVisible (lcd);
|
||||
setupKnobs();
|
||||
|
|
@ -20,7 +20,7 @@ SM26AudioProcessorEditor::SM26AudioProcessorEditor (SM26AudioProcessor& p)
|
|||
|
||||
footer.setText (buildGitFooter(), juce::dontSendNotification);
|
||||
footer.setJustificationType (juce::Justification::centredLeft);
|
||||
footer.setColour (juce::Label::textColourId, juce::Colour (0xFF90B080));
|
||||
footer.setColour (juce::Label::textColourId, juce::Colour (0xFFA0A0A0));
|
||||
footer.setFont (juce::Font (juce::FontOptions { juce::Font::getDefaultMonospacedFontName(), 11.0f, juce::Font::plain }));
|
||||
addAndMakeVisible (footer);
|
||||
|
||||
|
|
@ -48,20 +48,20 @@ void SM26AudioProcessorEditor::setupKnobs()
|
|||
knobSliders[i].setSliderStyle (juce::Slider::RotaryVerticalDrag);
|
||||
knobSliders[i].setTextBoxStyle (juce::Slider::NoTextBox, false, 0, 0);
|
||||
knobSliders[i].setRange (0.0, 1.0, 0.001);
|
||||
knobSliders[i].setColour (juce::Slider::rotarySliderFillColourId, juce::Colour (0xFF3A8A28));
|
||||
knobSliders[i].setColour (juce::Slider::rotarySliderOutlineColourId, juce::Colour (0xFF1A2E0A));
|
||||
knobSliders[i].setColour (juce::Slider::rotarySliderFillColourId, juce::Colour (0xFFC8C8C8));
|
||||
knobSliders[i].setColour (juce::Slider::rotarySliderOutlineColourId, juce::Colour (0xFF2A2A2A));
|
||||
knobSliders[i].setColour (juce::Slider::thumbColourId, juce::Colours::transparentBlack);
|
||||
knobSliders[i].addListener (this);
|
||||
addAndMakeVisible (knobSliders[i]);
|
||||
|
||||
knobLabels[i].setJustificationType (juce::Justification::centred);
|
||||
knobLabels[i].setColour (juce::Label::textColourId, juce::Colour (0xFF90B080));
|
||||
knobLabels[i].setFont (juce::Font (juce::FontOptions { juce::Font::getDefaultMonospacedFontName(), 11.0f, juce::Font::plain }));
|
||||
knobLabels[i].setColour (juce::Label::textColourId, juce::Colour (0xFFA0A0A0));
|
||||
knobLabels[i].setFont (juce::Font (juce::FontOptions { juce::Font::getDefaultMonospacedFontName(), 13.0f, juce::Font::plain }));
|
||||
addAndMakeVisible (knobLabels[i]);
|
||||
|
||||
knobValueLabels[i].setJustificationType (juce::Justification::centred);
|
||||
knobValueLabels[i].setColour (juce::Label::textColourId, juce::Colour (0xFFC0E0A0));
|
||||
knobValueLabels[i].setFont (juce::Font (juce::FontOptions { juce::Font::getDefaultMonospacedFontName(), 12.0f, juce::Font::bold }));
|
||||
knobValueLabels[i].setColour (juce::Label::textColourId, juce::Colour (0xFFD0D0D0));
|
||||
knobValueLabels[i].setFont (juce::Font (juce::FontOptions { juce::Font::getDefaultMonospacedFontName(), 14.0f, juce::Font::bold }));
|
||||
addAndMakeVisible (knobValueLabels[i]);
|
||||
|
||||
knobSliders[i].setValue (0.5, juce::dontSendNotification);
|
||||
|
|
@ -80,23 +80,27 @@ void SM26AudioProcessorEditor::setupNavButtons()
|
|||
{
|
||||
btn.setLookAndFeel (&navLookAndFeel);
|
||||
btn.setColour (juce::TextButton::buttonColourId, bg);
|
||||
btn.setColour (juce::TextButton::textColourOffId, juce::Colour (0xFFE0E0C0));
|
||||
btn.setColour (juce::ComboBox::outlineColourId, juce::Colour (0xFF2A4A18));
|
||||
btn.setColour (juce::TextButton::textColourOffId, juce::Colour (0xFFE0E0E0));
|
||||
btn.setColour (juce::ComboBox::outlineColourId, juce::Colour (0xFF444444));
|
||||
addAndMakeVisible (btn);
|
||||
};
|
||||
|
||||
setup (navUp, juce::Colour (0xFF2A4A18));
|
||||
setup (navDown, juce::Colour (0xFF2A4A18));
|
||||
setup (navLeft, juce::Colour (0xFF2A4A18));
|
||||
setup (navRight, juce::Colour (0xFF2A4A18));
|
||||
setup (navEnter, juce::Colour (0xFF3A6A28));
|
||||
setup (navEsc, juce::Colour (0xFF3A2A18));
|
||||
setup (navUp, juce::Colour (0xFF2A2A2A));
|
||||
setup (navDown, juce::Colour (0xFF2A2A2A));
|
||||
setup (navLeft, juce::Colour (0xFF2A2A2A));
|
||||
setup (navRight, juce::Colour (0xFF2A2A2A));
|
||||
setup (navEnter, juce::Colour (0xFF3F3F3F));
|
||||
setup (navEsc, juce::Colour (0xFF333333));
|
||||
|
||||
navUp.setTriggeredOnMouseDown (true);
|
||||
navUp.setRepeatSpeed (250, 50);
|
||||
navDown.setTriggeredOnMouseDown (true);
|
||||
navDown.setRepeatSpeed (250, 50);
|
||||
navUp.onClick = [this] { if (menu.isOpen()) menu.up(); else cyclePreset (-1); };
|
||||
navDown.onClick = [this] { if (menu.isOpen()) menu.down(); else cyclePreset (+1); };
|
||||
navLeft.onClick = [this] { menu.left(); };
|
||||
navRight.onClick = [this] { menu.right(); };
|
||||
navEnter.onClick = [this] { menu.open(); };
|
||||
navEnter.onClick = [this] { if (menu.isOpen()) menu.enter(); else menu.open(); };
|
||||
navEsc.onClick = [this] { if (menu.isOpen()) menu.escape(); else menu.close(); };
|
||||
}
|
||||
|
||||
|
|
@ -127,6 +131,38 @@ void SM26AudioProcessorEditor::buildRootMenu()
|
|||
return item;
|
||||
};
|
||||
|
||||
auto addValue = [&](const char* n, int pid) -> MenuItem
|
||||
{
|
||||
MenuItem mi;
|
||||
mi.label = n;
|
||||
mi.kind = MenuItem::Value;
|
||||
mi.paramId = pid;
|
||||
mi.valueText = [this, pid]() {
|
||||
if (pid == sm26::PDTIME && proc.engine.getParam (sm26::PDSYNC) > 0.5f)
|
||||
return sm26::formatTimeMs ((float) proc.engine.delayTimeMs());
|
||||
return sm26::formatParamReal (pid, proc.engine.getParam (pid));
|
||||
};
|
||||
mi.onAdjust = [this, pid](float d) {
|
||||
float delta = (pid == sm26::PDSTEPS) ? d / 0.02f * (1.0f / 15.0f) : d;
|
||||
float cur = proc.engine.getParam (pid);
|
||||
proc.engine.setParam (pid, sm26::clamp01 (cur + delta));
|
||||
for (int k = 0; k < 4; ++k)
|
||||
{
|
||||
auto kv = proc.engine.knobView (k);
|
||||
if (kv.param == pid)
|
||||
proc.setKnob (k, sm26::clamp01 ((proc.engine.getParam (pid) - kv.lo) / (kv.hi - kv.lo + 1e-9f)));
|
||||
}
|
||||
};
|
||||
return mi;
|
||||
};
|
||||
|
||||
auto addHeader = [&](const char* n) {
|
||||
MenuItem h;
|
||||
h.label = "-- " + juce::String (n) + " --";
|
||||
h.kind = MenuItem::Separator;
|
||||
s.items.push_back (h);
|
||||
};
|
||||
|
||||
{
|
||||
MenuItem m;
|
||||
m.label = "PRESETS (" + juce::String (sm26::PresetStore::count()) + ")";
|
||||
|
|
@ -135,254 +171,104 @@ void SM26AudioProcessorEditor::buildRootMenu()
|
|||
MenuScreen ps;
|
||||
ps.title = "SELECT PRESET";
|
||||
ps.selected = proc.engine.presetIndex();
|
||||
for (int i = 0; i < sm26::PresetStore::count(); ++i)
|
||||
ps.items.push_back (addPreset (
|
||||
sm26::PresetStore::get(i)->name, i));
|
||||
juce::String lastCat;
|
||||
const int count = sm26::PresetStore::count();
|
||||
for (int i = 0; i < count; ++i)
|
||||
{
|
||||
const auto* p = sm26::PresetStore::get (i);
|
||||
if (lastCat != p->category)
|
||||
{
|
||||
MenuItem h;
|
||||
h.label = "---- " + juce::String (p->category) + " ----";
|
||||
h.kind = MenuItem::Separator;
|
||||
ps.items.push_back (h);
|
||||
lastCat = p->category;
|
||||
}
|
||||
ps.items.push_back (addPreset (p->name, i));
|
||||
}
|
||||
menu.pushScreen (ps);
|
||||
};
|
||||
s.items.push_back (m);
|
||||
}
|
||||
|
||||
s.items.push_back (MenuItem().sep());
|
||||
addHeader ("OSCILLATORS");
|
||||
s.items.push_back (addValue ("OSC1 WAVE", sm26::PO1WAVE));
|
||||
s.items.push_back (addValue ("OSC2 WAVE", sm26::PO2WAVE));
|
||||
s.items.push_back (addValue ("O1 OCTAVE", sm26::PO1OCT));
|
||||
s.items.push_back (addValue ("O1 DETUNE", sm26::PO1CT));
|
||||
s.items.push_back (addValue ("O2 OCTAVE", sm26::PO2OCT));
|
||||
s.items.push_back (addValue ("O2 DETUNE", sm26::PO2CT));
|
||||
s.items.push_back (addValue ("MIX", sm26::PMIX));
|
||||
s.items.push_back (addValue ("NOISE", sm26::PNOISE));
|
||||
|
||||
addHeader ("FILTER");
|
||||
s.items.push_back (addValue ("CUTOFF", sm26::PCUTOFF));
|
||||
s.items.push_back (addValue ("RES", sm26::PRES));
|
||||
s.items.push_back (addValue ("F-ENV", sm26::PFENV));
|
||||
s.items.push_back (addValue ("F-TYPE", sm26::PFTYPE));
|
||||
|
||||
addHeader ("ENVELOPE");
|
||||
s.items.push_back (addValue ("ATTACK", sm26::PATK));
|
||||
s.items.push_back (addValue ("DECAY", sm26::PDEC));
|
||||
s.items.push_back (addValue ("SUSTAIN", sm26::PSUS));
|
||||
s.items.push_back (addValue ("RELEASE", sm26::PREL));
|
||||
|
||||
addHeader ("DELAY");
|
||||
s.items.push_back (addValue ("TIME/STEPS", sm26::PDTIME));
|
||||
s.items.push_back (addValue ("STEPS", sm26::PDSTEPS));
|
||||
s.items.push_back (addValue ("SYNC", sm26::PDSYNC));
|
||||
s.items.push_back (addValue ("FEEDBACK", sm26::PDFB));
|
||||
s.items.push_back (addValue ("MIX", sm26::PDMIX));
|
||||
|
||||
addHeader ("SYSTEM");
|
||||
s.items.push_back (addValue ("DRIVE", sm26::PDRIVE));
|
||||
s.items.push_back (addValue ("GLIDE", sm26::PGLIDE));
|
||||
s.items.push_back (addValue ("MASTER", sm26::PMASTER));
|
||||
|
||||
addHeader ("INFO");
|
||||
{
|
||||
MenuItem m;
|
||||
m.label = "OSCILLATORS";
|
||||
m.kind = MenuItem::Submenu;
|
||||
m.onEnter = [this]() {
|
||||
MenuScreen os;
|
||||
os.title = "OSCILLATORS";
|
||||
os.selected = 0;
|
||||
|
||||
auto addItem = [&](const char* n, int pid) {
|
||||
MenuItem mi;
|
||||
mi.label = n;
|
||||
mi.kind = MenuItem::Value;
|
||||
mi.paramId = pid;
|
||||
mi.valueText = [this, pid]() { return sm26::formatParamReal (pid, proc.engine.getParam (pid)); };
|
||||
mi.onAdjust = [this, pid](float d) {
|
||||
float cur = proc.engine.getParam (pid);
|
||||
proc.engine.setParam (pid, sm26::clamp01 (cur + d));
|
||||
for (int k = 0; k < 4; ++k)
|
||||
{
|
||||
auto kv = proc.engine.knobView (k);
|
||||
if (kv.param == pid)
|
||||
proc.setKnob (k, sm26::clamp01 ((proc.engine.getParam (pid) - kv.lo) / (kv.hi - kv.lo + 1e-9f)));
|
||||
}
|
||||
};
|
||||
os.items.push_back (mi);
|
||||
};
|
||||
|
||||
addItem ("OSC1 WAVE", sm26::PO1WAVE);
|
||||
addItem ("OSC2 WAVE", sm26::PO2WAVE);
|
||||
addItem ("O1 OCTAVE", sm26::PO1OCT);
|
||||
addItem ("O1 DETUNE", sm26::PO1CT);
|
||||
addItem ("O2 OCTAVE", sm26::PO2OCT);
|
||||
addItem ("O2 DETUNE", sm26::PO2CT);
|
||||
addItem ("MIX", sm26::PMIX);
|
||||
addItem ("NOISE", sm26::PNOISE);
|
||||
menu.pushScreen (os);
|
||||
};
|
||||
s.items.push_back (m);
|
||||
}
|
||||
|
||||
{
|
||||
MenuItem m;
|
||||
m.label = "FILTER";
|
||||
m.kind = MenuItem::Submenu;
|
||||
m.onEnter = [this]() {
|
||||
MenuScreen fs;
|
||||
fs.title = "FILTER";
|
||||
fs.selected = 0;
|
||||
|
||||
auto addItem = [&](const char* n, int pid) {
|
||||
MenuItem mi;
|
||||
mi.label = n;
|
||||
mi.kind = MenuItem::Value;
|
||||
mi.paramId = pid;
|
||||
mi.valueText = [this, pid]() { return sm26::formatParamReal (pid, proc.engine.getParam (pid)); };
|
||||
mi.onAdjust = [this, pid](float d) {
|
||||
float cur = proc.engine.getParam (pid);
|
||||
proc.engine.setParam (pid, sm26::clamp01 (cur + d));
|
||||
for (int k = 0; k < 4; ++k)
|
||||
{
|
||||
auto kv = proc.engine.knobView (k);
|
||||
if (kv.param == pid)
|
||||
proc.setKnob (k, sm26::clamp01 ((proc.engine.getParam (pid) - kv.lo) / (kv.hi - kv.lo + 1e-9f)));
|
||||
}
|
||||
};
|
||||
fs.items.push_back (mi);
|
||||
};
|
||||
|
||||
addItem ("CUTOFF", sm26::PCUTOFF);
|
||||
addItem ("RES", sm26::PRES);
|
||||
addItem ("F-ENV", sm26::PFENV);
|
||||
addItem ("F-TYPE", sm26::PFTYPE);
|
||||
menu.pushScreen (fs);
|
||||
};
|
||||
s.items.push_back (m);
|
||||
}
|
||||
|
||||
{
|
||||
MenuItem m;
|
||||
m.label = "ENVELOPE";
|
||||
m.kind = MenuItem::Submenu;
|
||||
m.onEnter = [this]() {
|
||||
MenuScreen es;
|
||||
es.title = "ENVELOPE";
|
||||
es.selected = 0;
|
||||
|
||||
auto addItem = [&](const char* n, int pid) {
|
||||
MenuItem mi;
|
||||
mi.label = n;
|
||||
mi.kind = MenuItem::Value;
|
||||
mi.paramId = pid;
|
||||
mi.valueText = [this, pid]() { return sm26::formatParamReal (pid, proc.engine.getParam (pid)); };
|
||||
mi.onAdjust = [this, pid](float d) {
|
||||
float cur = proc.engine.getParam (pid);
|
||||
proc.engine.setParam (pid, sm26::clamp01 (cur + d));
|
||||
for (int k = 0; k < 4; ++k)
|
||||
{
|
||||
auto kv = proc.engine.knobView (k);
|
||||
if (kv.param == pid)
|
||||
proc.setKnob (k, sm26::clamp01 ((proc.engine.getParam (pid) - kv.lo) / (kv.hi - kv.lo + 1e-9f)));
|
||||
}
|
||||
};
|
||||
es.items.push_back (mi);
|
||||
};
|
||||
|
||||
addItem ("ATTACK", sm26::PATK);
|
||||
addItem ("DECAY", sm26::PDEC);
|
||||
addItem ("SUSTAIN", sm26::PSUS);
|
||||
addItem ("RELEASE", sm26::PREL);
|
||||
menu.pushScreen (es);
|
||||
};
|
||||
s.items.push_back (m);
|
||||
}
|
||||
|
||||
{
|
||||
MenuItem m;
|
||||
m.label = "DELAY";
|
||||
m.kind = MenuItem::Submenu;
|
||||
m.onEnter = [this]() {
|
||||
MenuScreen ds;
|
||||
ds.title = "DELAY";
|
||||
ds.selected = 0;
|
||||
|
||||
auto addItem = [&](const char* n, int pid) {
|
||||
MenuItem mi;
|
||||
mi.label = n;
|
||||
mi.kind = MenuItem::Value;
|
||||
mi.paramId = pid;
|
||||
mi.valueText = [this, pid]() { return sm26::formatParamReal (pid, proc.engine.getParam (pid)); };
|
||||
mi.onAdjust = [this, pid](float d) {
|
||||
float cur = proc.engine.getParam (pid);
|
||||
proc.engine.setParam (pid, sm26::clamp01 (cur + d));
|
||||
for (int k = 0; k < 4; ++k)
|
||||
{
|
||||
auto kv = proc.engine.knobView (k);
|
||||
if (kv.param == pid)
|
||||
proc.setKnob (k, sm26::clamp01 ((proc.engine.getParam (pid) - kv.lo) / (kv.hi - kv.lo + 1e-9f)));
|
||||
}
|
||||
};
|
||||
ds.items.push_back (mi);
|
||||
};
|
||||
|
||||
addItem ("TIME/STEPS", sm26::PDTIME);
|
||||
addItem ("STEPS", sm26::PDSTEPS);
|
||||
addItem ("SYNC", sm26::PDSYNC);
|
||||
addItem ("FEEDBACK", sm26::PDFB);
|
||||
addItem ("MIX", sm26::PDMIX);
|
||||
menu.pushScreen (ds);
|
||||
};
|
||||
s.items.push_back (m);
|
||||
}
|
||||
|
||||
{
|
||||
MenuItem m;
|
||||
m.label = "SYSTEM";
|
||||
m.kind = MenuItem::Submenu;
|
||||
m.onEnter = [this]() {
|
||||
MenuScreen ss;
|
||||
ss.title = "SYSTEM";
|
||||
ss.selected = 0;
|
||||
|
||||
auto addItem = [&](const char* n, int pid) {
|
||||
MenuItem mi;
|
||||
mi.label = n;
|
||||
mi.kind = MenuItem::Value;
|
||||
mi.paramId = pid;
|
||||
mi.valueText = [this, pid]() { return sm26::formatParamReal (pid, proc.engine.getParam (pid)); };
|
||||
mi.onAdjust = [this, pid](float d) {
|
||||
float cur = proc.engine.getParam (pid);
|
||||
proc.engine.setParam (pid, sm26::clamp01 (cur + d));
|
||||
for (int k = 0; k < 4; ++k)
|
||||
{
|
||||
auto kv = proc.engine.knobView (k);
|
||||
if (kv.param == pid)
|
||||
proc.setKnob (k, sm26::clamp01 ((proc.engine.getParam (pid) - kv.lo) / (kv.hi - kv.lo + 1e-9f)));
|
||||
}
|
||||
};
|
||||
ss.items.push_back (mi);
|
||||
};
|
||||
|
||||
addItem ("DRIVE", sm26::PDRIVE);
|
||||
addItem ("GLIDE", sm26::PGLIDE);
|
||||
addItem ("MASTER", sm26::PMASTER);
|
||||
|
||||
MenuItem mi;
|
||||
mi.label = "ABOUT";
|
||||
mi.kind = MenuItem::Action;
|
||||
mi.onEnter = [this]() {
|
||||
MenuScreen as;
|
||||
as.title = "ABOUT";
|
||||
as.selected = 0;
|
||||
{
|
||||
MenuItem mi; mi.label = "---"; mi.kind = MenuItem::Separator;
|
||||
ss.items.push_back (mi);
|
||||
MenuItem m2; m2.label = "SM-26 Sound Module by A. Jenewein"; m2.kind = MenuItem::Action;
|
||||
as.items.push_back (m2);
|
||||
}
|
||||
|
||||
{
|
||||
MenuItem mi;
|
||||
mi.label = "ABOUT";
|
||||
mi.kind = MenuItem::Action;
|
||||
mi.onEnter = [this]() {
|
||||
MenuScreen as;
|
||||
as.title = "ABOUT";
|
||||
as.selected = 0;
|
||||
{
|
||||
MenuItem m2; m2.label = "SM-26 Synthesizer"; m2.kind = MenuItem::Action;
|
||||
as.items.push_back (m2);
|
||||
}
|
||||
{
|
||||
MenuItem m2;
|
||||
m2.label = "Version: " + juce::String (SM26_GIT_VERSION);
|
||||
m2.kind = MenuItem::Action;
|
||||
as.items.push_back (m2);
|
||||
}
|
||||
{
|
||||
MenuItem m2;
|
||||
m2.label = "Built: " + juce::String (SM26_BUILD_TIME);
|
||||
m2.kind = MenuItem::Action;
|
||||
as.items.push_back (m2);
|
||||
}
|
||||
{
|
||||
MenuItem m2;
|
||||
m2.label = "Branch: " + juce::String (SM26_GIT_BRANCH);
|
||||
m2.kind = MenuItem::Action;
|
||||
as.items.push_back (m2);
|
||||
}
|
||||
{
|
||||
MenuItem m2; m2.label = ""; m2.kind = MenuItem::Separator;
|
||||
as.items.push_back (m2);
|
||||
}
|
||||
{
|
||||
MenuItem m2;
|
||||
m2.label = "52 presets | VST3 + AU";
|
||||
m2.kind = MenuItem::Action;
|
||||
as.items.push_back (m2);
|
||||
}
|
||||
menu.pushScreen (as);
|
||||
};
|
||||
ss.items.push_back (mi);
|
||||
MenuItem m2;
|
||||
m2.label = "Version: " + juce::String (SM26_GIT_VERSION);
|
||||
m2.kind = MenuItem::Action;
|
||||
as.items.push_back (m2);
|
||||
}
|
||||
|
||||
menu.pushScreen (ss);
|
||||
{
|
||||
MenuItem m2;
|
||||
m2.label = "Built: " + juce::String (SM26_BUILD_TIME);
|
||||
m2.kind = MenuItem::Action;
|
||||
as.items.push_back (m2);
|
||||
}
|
||||
{
|
||||
MenuItem m2;
|
||||
m2.label = "Branch: " + juce::String (SM26_GIT_BRANCH);
|
||||
m2.kind = MenuItem::Action;
|
||||
as.items.push_back (m2);
|
||||
}
|
||||
{
|
||||
MenuItem m2; m2.label = "---"; m2.kind = MenuItem::Separator;
|
||||
as.items.push_back (m2);
|
||||
}
|
||||
{
|
||||
MenuItem m2;
|
||||
m2.label = juce::String (sm26::PresetStore::count()) + " presets | VST3 + AU";
|
||||
m2.kind = MenuItem::Action;
|
||||
as.items.push_back (m2);
|
||||
}
|
||||
menu.pushScreen (as);
|
||||
};
|
||||
s.items.push_back (m);
|
||||
s.items.push_back (mi);
|
||||
}
|
||||
|
||||
return s;
|
||||
|
|
@ -393,80 +279,20 @@ void SM26AudioProcessorEditor::buildRootMenu()
|
|||
|
||||
void SM26AudioProcessorEditor::paint (juce::Graphics& g)
|
||||
{
|
||||
g.fillAll (juce::Colour (0xFF0A0F06));
|
||||
g.fillAll (juce::Colour (0xFF000000));
|
||||
|
||||
const float totalW = (float) getWidth();
|
||||
const float totalH = (float) getHeight();
|
||||
|
||||
g.setColour (juce::Colour (0xFF1A2E0A));
|
||||
g.setColour (juce::Colour (0xFF1A1A1A));
|
||||
g.fillRoundedRectangle (8.0f, 8.0f, totalW - 16.0f, totalH - 16.0f, 6.0f);
|
||||
|
||||
g.setColour (juce::Colour (0xFF2A4A18));
|
||||
g.setColour (juce::Colour (0xFF333333));
|
||||
g.drawRoundedRectangle (8.0f, 8.0f, totalW - 16.0f, totalH - 16.0f, 6.0f, 1.5f);
|
||||
|
||||
if (! menu.isOpen())
|
||||
{
|
||||
g.setColour (juce::Colour (0xFF6AE050));
|
||||
g.setFont (juce::Font (juce::FontOptions { juce::Font::getDefaultMonospacedFontName(), 14.0f, juce::Font::bold }));
|
||||
g.drawText ("SM-26", 20.0f, 16.0f, 100.0f, 22.0f, juce::Justification::centredLeft);
|
||||
}
|
||||
else
|
||||
{
|
||||
g.setColour (juce::Colour (0xFFE0E0C0));
|
||||
g.setFont (juce::Font (juce::FontOptions { juce::Font::getDefaultMonospacedFontName(), 14.0f, juce::Font::bold }));
|
||||
g.drawText (menu.current().title, 20.0f, 16.0f, getWidth() - 40.0f, 22.0f,
|
||||
juce::Justification::centred);
|
||||
}
|
||||
|
||||
if (menu.isOpen())
|
||||
{
|
||||
const auto& ms = menu.current();
|
||||
float y = 44.0f;
|
||||
float itemH = 18.0f;
|
||||
float menuLeft = 20.0f;
|
||||
float menuW = getWidth() - 40.0f;
|
||||
|
||||
for (int i = 0; i < (int) ms.items.size() && y < (float) getHeight() - 60.0f; ++i)
|
||||
{
|
||||
const auto& item = ms.items[i];
|
||||
|
||||
if (item.kind == MenuItem::Separator)
|
||||
{
|
||||
g.setColour (juce::Colour (0xFF2A4A18));
|
||||
g.drawHorizontalLine ((int) y, menuLeft, menuLeft + menuW);
|
||||
y += 4.0f;
|
||||
continue;
|
||||
}
|
||||
|
||||
bool selected = (i == ms.selected);
|
||||
|
||||
if (selected)
|
||||
{
|
||||
g.setColour (juce::Colour (0xFF3A6A28));
|
||||
g.fillRoundedRectangle (menuLeft, y, menuW, itemH, 3.0f);
|
||||
}
|
||||
|
||||
g.setColour (selected ? juce::Colour (0xFFE0E0C0) : juce::Colour (0xFF709060));
|
||||
g.setFont (juce::Font (juce::FontOptions { juce::Font::getDefaultMonospacedFontName(), 12.0f, juce::Font::plain }));
|
||||
g.drawText (item.label, menuLeft + 8.0f, y, menuW * 0.6f, itemH,
|
||||
juce::Justification::centredLeft);
|
||||
|
||||
if (item.kind == MenuItem::Value && item.valueText)
|
||||
{
|
||||
g.setColour (juce::Colour (0xFFA0E080));
|
||||
g.drawText (item.valueText(), menuLeft + menuW * 0.55f, y,
|
||||
menuW * 0.4f, itemH, juce::Justification::centredRight);
|
||||
}
|
||||
else if (item.kind == MenuItem::Submenu)
|
||||
{
|
||||
g.setColour (juce::Colour (0xFF90B080));
|
||||
g.drawText (">", menuLeft + menuW - 16.0f, y, 16.0f, itemH,
|
||||
juce::Justification::centredRight);
|
||||
}
|
||||
|
||||
y += itemH + 1.0f;
|
||||
}
|
||||
}
|
||||
g.setColour (juce::Colour (0xFFC8C8C8));
|
||||
g.setFont (juce::Font (juce::FontOptions { juce::Font::getDefaultMonospacedFontName(), 14.0f, juce::Font::bold }));
|
||||
g.drawText ("SM-26", 20.0f, 16.0f, 100.0f, 22.0f, juce::Justification::centredLeft);
|
||||
}
|
||||
|
||||
void SM26AudioProcessorEditor::resized()
|
||||
|
|
@ -474,24 +300,26 @@ void SM26AudioProcessorEditor::resized()
|
|||
const float totalW = (float) getWidth();
|
||||
const float totalH = (float) getHeight();
|
||||
|
||||
float knobSize = 62.0f;
|
||||
float knobGap = 18.0f;
|
||||
float knobSize = 78.0f;
|
||||
float knobGap = 20.0f;
|
||||
float knobsW = 4.0f * knobSize + 3.0f * knobGap;
|
||||
float knobsX = (totalW - knobsW) / 2.0f;
|
||||
float knobsY = juce::jmax (190.0f, totalH - 265.0f);
|
||||
float knobsY = juce::jmax (360.0f, totalH - 300.0f);
|
||||
|
||||
for (int i = 0; i < 4; ++i)
|
||||
{
|
||||
float x = knobsX + (float) i * (knobSize + knobGap);
|
||||
knobSliders[i].setBounds ((int) x, (int) knobsY, (int) knobSize, (int) knobSize);
|
||||
knobLabels[i].setBounds ((int) x, (int) (knobsY + knobSize + 2), (int) knobSize, 16);
|
||||
knobValueLabels[i].setBounds ((int) x, (int) (knobsY + knobSize + 18), (int) knobSize, 14);
|
||||
knobLabels[i].setBounds ((int) x, (int) (knobsY + knobSize + 2), (int) knobSize, 18);
|
||||
knobValueLabels[i].setBounds ((int) x, (int) (knobsY + knobSize + 20), (int) knobSize, 16);
|
||||
}
|
||||
|
||||
float navSize = 30.0f;
|
||||
float navGap = 3.0f;
|
||||
float navCenterX = totalW / 2.0f;
|
||||
float navCenterY = totalH - 90.0f;
|
||||
float legendBottom = knobsY + knobSize + 20.0f + 16.0f;
|
||||
float footerTop = totalH - 22.0f;
|
||||
float navCenterY = (legendBottom + footerTop) * 0.5f;
|
||||
|
||||
navUp.setBounds ((int) (navCenterX - navSize / 2), (int) (navCenterY - navSize - navGap),
|
||||
(int) navSize, (int) navSize);
|
||||
|
|
@ -507,7 +335,7 @@ void SM26AudioProcessorEditor::resized()
|
|||
navEsc.setBounds ((int) (navCenterX + navGap), (int) (navCenterY + navSize + navGap),
|
||||
(int) navSize, (int) navSize);
|
||||
|
||||
lcd.setBounds (14, 42, (int) totalW - 28, 150);
|
||||
lcd.setBounds (14, 16, (int) totalW - 28, 302);
|
||||
|
||||
footer.setBounds (8, (int) totalH - 22, (int) totalW - 16, 16);
|
||||
}
|
||||
|
|
@ -576,30 +404,22 @@ void SM26AudioProcessorEditor::updateLCD()
|
|||
lcd.setLine (0, juce::String (presetIdx + 1) + "/" + juce::String (sm26::PresetStore::count())
|
||||
+ " " + sm26::PresetStore::fullLabel (*p));
|
||||
|
||||
lcd.setLine (1, padRight (proc.engine.knobView (0).name, 12)
|
||||
+ padRight (sm26::formatParamReal (proc.engine.knobView(0).param,
|
||||
proc.engine.getParam(proc.engine.knobView(0).param)), 12)
|
||||
+ " "
|
||||
+ padRight (proc.engine.knobView (2).name, 12)
|
||||
+ sm26::formatParamReal (proc.engine.knobView(2).param,
|
||||
proc.engine.getParam(proc.engine.knobView(2).param)));
|
||||
|
||||
lcd.setLine (2, padRight (proc.engine.knobView (1).name, 12)
|
||||
+ padRight (sm26::formatParamReal (proc.engine.knobView(1).param,
|
||||
proc.engine.getParam(proc.engine.knobView(1).param)), 12)
|
||||
+ " "
|
||||
+ padRight (proc.engine.knobView (3).name, 12)
|
||||
+ sm26::formatParamReal (proc.engine.knobView(3).param,
|
||||
proc.engine.getParam(proc.engine.knobView(3).param)));
|
||||
for (int k = 0; k < 4; ++k)
|
||||
{
|
||||
auto kv = proc.engine.knobView (k);
|
||||
lcd.setLine (1 + k, padRight (kv.name, 20)
|
||||
+ sm26::formatParamReal (kv.param, proc.engine.getParam (kv.param)));
|
||||
}
|
||||
|
||||
double bpm = proc.engine.lastBpm();
|
||||
bool playing = proc.engine.transport();
|
||||
juce::String bpmStr = playing ? juce::String (bpm, 1) + " BPM" : "--- BPM";
|
||||
juce::String bpmStr = juce::String (bpm, 1) + " BPM";
|
||||
int notes = proc.engine.notesPlaying();
|
||||
juce::String notesStr = notes > 0 ? "NOTES:" + juce::String (notes) : "";
|
||||
|
||||
lcd.setLine (3, juce::String ("SM-26") + " " + bpmStr + " " + notesStr
|
||||
+ " UP/DN=PATCH OK=MENU");
|
||||
lcd.setLine (6, bpmStr + (notesStr.isNotEmpty() ? " " + notesStr : ""));
|
||||
lcd.setLine (7, juce::String ("SM-26") + " UP/DN=PATCH OK=MENU");
|
||||
for (int r = 0; r < LcdDisplay::kRows; ++r)
|
||||
lcd.setInverted (r, false);
|
||||
lcd.showCursor (false);
|
||||
}
|
||||
else
|
||||
|
|
@ -607,18 +427,39 @@ void SM26AudioProcessorEditor::updateLCD()
|
|||
const auto& cs = menu.current();
|
||||
|
||||
lcd.setLine (0, "== " + cs.title + " ==");
|
||||
for (int row = 0; row < 3 && row < (int) cs.items.size(); ++row)
|
||||
|
||||
for (int r = 0; r < LcdDisplay::kRows; ++r)
|
||||
lcd.setInverted (r, false);
|
||||
|
||||
std::vector<int> shown;
|
||||
for (int i = 0; i < (int) cs.items.size(); ++i)
|
||||
{
|
||||
int idx = juce::jlimit (0, (int) cs.items.size() - 1, cs.selected + row);
|
||||
const auto& it = cs.items[i];
|
||||
if (it.kind == MenuItem::Separator && it.label.isEmpty())
|
||||
continue;
|
||||
shown.push_back (i);
|
||||
}
|
||||
|
||||
int pos = 0;
|
||||
for (int i = 0; i < (int) shown.size(); ++i)
|
||||
if (shown[i] == cs.selected) { pos = i; break; }
|
||||
|
||||
int top = juce::jlimit (0, juce::jmax (0, (int) shown.size() - 6), pos - 2);
|
||||
for (int row = 0; row < 6 && top + row < (int) shown.size(); ++row)
|
||||
{
|
||||
int idx = shown[top + row];
|
||||
const auto& item = cs.items[idx];
|
||||
juce::String line = (idx == cs.selected ? "> " : " ") + item.label;
|
||||
juce::String line = " " + item.label;
|
||||
if (item.kind == MenuItem::Value && item.valueText)
|
||||
line = padRight (line, 50) + item.valueText();
|
||||
else if (item.kind == MenuItem::Submenu)
|
||||
line = line + " [ENTER]";
|
||||
else if (item.kind == MenuItem::Separator)
|
||||
line = " " + item.label;
|
||||
lcd.setLine (1 + row, line);
|
||||
lcd.setInverted (1 + row, idx == cs.selected);
|
||||
}
|
||||
lcd.setLine (3, "UP/DN=SEL L/R=VAL OK=OK ESC=BACK");
|
||||
lcd.setLine (7, "UP/DN=SEL L/R=VAL OK=OK ESC=BACK");
|
||||
lcd.showCursor (false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue