audio/wavetable
2
0
Fork 0
mirror of https://codeberg.org/armin/wavetable.git synced 2026-09-01 14:00:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

tweaks

Browse source
This commit is contained in:
Roland Rabien 2023-08-31 21:02:23 -07:00
commit 5ccbcd7218
7 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/gin

@ -1 +1 @@
Subproject commit 1685be0cececd415a8c8d485efe18f9121b16ced Subproject commit 8dd1b3db2ab0079d41c635370920d3783b2d253c

2
plugin/Resources/layout.json
View file

@ -11,7 +11,7 @@
}, },
{ "id": "sub", "x": "prevR()+1", "y": "prevY()", "w": 112, "h": 163, "children": { "id": "sub", "x": "prevR()+1", "y": "prevY()", "w": 112, "h": 163, "children":
[ [
{ "id": "Wave", "x": "56", "y": 23, "w": 56, "h": 70 }, { "id": "Wave", "x": 0, "y": 23, "w": 56, "h": 70 },
{ "id": "Tune", "x": "prevR()", "y": 23, "w": 56, "h": 70 }, { "id": "Tune", "x": "prevR()", "y": 23, "w": 56, "h": 70 },
{ "id": "Level", "x": 0, "y": "prevB()", "w": 56, "h": 70 }, { "id": "Level", "x": 0, "y": "prevB()", "w": 56, "h": 70 },
{ "id": "Pan", "x": "prevR()", "y": "prevY()", "w": 56, "h": 70 } { "id": "Pan", "x": "prevR()", "y": "prevY()", "w": 56, "h": 70 }

1
plugin/Source/Editor.h
View file

@ -14,7 +14,6 @@ public:
void resized() override; void resized() override;
private: private:
WavetableAudioProcessor& proc; WavetableAudioProcessor& proc;
OscillatorBox oscillators[Cfg::numOSCs] { { "oscillator 1", proc, 0 }, { "oscillator 2", proc, 1 } }; OscillatorBox oscillators[Cfg::numOSCs] { { "oscillator 1", proc, 0 }, { "oscillator 2", proc, 1 } };

4
plugin/Source/Panels.h
View file

@ -438,8 +438,8 @@ public:
addControl (new gin::Knob (proc.globalParams.glideRate), 2, 0); addControl (new gin::Knob (proc.globalParams.glideRate), 2, 0);
addControl (new gin::Knob (proc.globalParams.voices), 0, 1); addControl (new gin::Knob (proc.globalParams.voices), 0, 1);
addControl (new gin::Select (proc.globalParams.legato), 1, 1); addControl (new gin::Switch (proc.globalParams.legato), 1, 1);
addControl (new gin::Select (proc.globalParams.mono), 2, 1); addControl (new gin::Switch (proc.globalParams.mono), 2, 1);
setSize (168, 163); setSize (168, 163);
} }

9
plugin/Source/PluginEditor.cpp
View file

@ -60,3 +60,12 @@ void WavetableAudioProcessorEditor::resized()
editor.setBounds (rc); editor.setBounds (rc);
patchBrowser.setBounds (rc); patchBrowser.setBounds (rc);
} }
void WavetableAudioProcessorEditor::addMenuItems (juce::PopupMenu& m)
{
m.addSeparator();
m.addItem ("MPE", true, vaProc.globalParams.mpe->getUserValueBool(), [this]
{
vaProc.globalParams.mpe->setUserValue (vaProc.globalParams.mpe->getUserValueBool() ? 0.0f : 1.0f);
});
}

1
plugin/Source/PluginEditor.h
View file

@ -15,6 +15,7 @@ public:
//============================================================================== //==============================================================================
void paint (juce::Graphics&) override; void paint (juce::Graphics&) override;
void resized() override; void resized() override;
void addMenuItems (juce::PopupMenu& m) override;
void showAboutInfo() override; void showAboutInfo() override;

20
plugin/Source/PluginProcessor.cpp
View file

@ -605,15 +605,6 @@ void WavetableAudioProcessor::setupModMatrix()
modSrcNote = modMatrix.addPolyModSource ("note", "MIDI Note Number", false); modSrcNote = modMatrix.addPolyModSource ("note", "MIDI Note Number", false);
modSrcVelocity = modMatrix.addPolyModSource ("vel", "MIDI Velocity", false); modSrcVelocity = modMatrix.addPolyModSource ("vel", "MIDI Velocity", false);
for (int i = 0; i <= 119; i++)
{
juce::String name = juce::MidiMessage::getControllerName (i);
if (name.isEmpty())
modSrcCC.add (modMatrix.addMonoModSource (juce::String::formatted ("cc%d", i), juce::String::formatted ("CC %d", i), false));
else
modSrcCC.add (modMatrix.addMonoModSource (juce::String::formatted ("cc%d", i), juce::String::formatted ("CC %d ", i) + name, false));
}
for (int i = 0; i < Cfg::numLFOs; i++) for (int i = 0; i < Cfg::numLFOs; i++)
modSrcMonoLFO.add (modMatrix.addMonoModSource (juce::String::formatted ("mlfo%d", i + 1), juce::String::formatted ("LFO %d (Mono)", i + 1), true)); modSrcMonoLFO.add (modMatrix.addMonoModSource (juce::String::formatted ("mlfo%d", i + 1), juce::String::formatted ("LFO %d (Mono)", i + 1), true));
@ -627,6 +618,15 @@ void WavetableAudioProcessor::setupModMatrix()
for (int i = 0; i < Cfg::numENVs; i++) for (int i = 0; i < Cfg::numENVs; i++)
modSrcEnv.add (modMatrix.addPolyModSource (juce::String::formatted ("env%d", i + 1), juce::String::formatted ("Envelope %d", i + 1), false)); modSrcEnv.add (modMatrix.addPolyModSource (juce::String::formatted ("env%d", i + 1), juce::String::formatted ("Envelope %d", i + 1), false));
for (int i = 0; i <= 119; i++)
{
juce::String name = juce::MidiMessage::getControllerName (i);
if (name.isEmpty())
modSrcCC.add (modMatrix.addMonoModSource (juce::String::formatted ("cc%d", i), juce::String::formatted ("CC %d", i), false));
else
modSrcCC.add (modMatrix.addMonoModSource (juce::String::formatted ("cc%d", i), juce::String::formatted ("CC %d ", i) + name, false));
}
auto firstMonoParam = globalParams.mono; auto firstMonoParam = globalParams.mono;
bool polyParam = true; bool polyParam = true;
for (auto pp : getPluginParameters()) for (auto pp : getPluginParameters())
@ -635,9 +635,7 @@ void WavetableAudioProcessor::setupModMatrix()
polyParam = false; polyParam = false;
if (! pp->isInternal()) if (! pp->isInternal())
{
modMatrix.addParameter (pp, polyParam); modMatrix.addParameter (pp, polyParam);
}
} }
modMatrix.build(); modMatrix.build();