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

More UI

Browse source
This commit is contained in:
Roland Rabien 2023-08-27 07:57:23 -07:00
commit c8a79d4693
5 changed files with 51 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugin/Source/Panels.h
View file

@ -39,6 +39,7 @@ public:
wt = new gin::WavetableComponent();
wt->setName ("wt");
wt->setWavetables (idx == 0 ? &proc.osc1Tables : &proc.osc2Tables);
wt->onFileDrop = [this] (const juce::File& f) { proc.loadUserWavetable (idx, f); };
addControl (wt, 5, 0, 3, 2);
timer.startTimerHz (60);

1
plugin/Source/PluginEditor.cpp
View file

@ -49,4 +49,5 @@ void WavetableAudioProcessorEditor::resized()
rc.removeFromTop (40);
editor.setBounds (rc);
patchBrowser.setBounds (rc);
}

51
plugin/Source/PluginProcessor.cpp
View file

@ -336,16 +336,21 @@ void WavetableAudioProcessor::ReverbParams::setup (WavetableAudioProcessor& p)
mix = p.addExtParam ("rvbMix", "Mix", "", "", {0.0f, 1.0f, 0.0f, 1.0f}, 0.0f, 0.0f);
}
static void loadWaveTable (juce::OwnedArray<gin::BandLimitedLookupTable>& table, double sr, const juce::MemoryBlock& wav)
static bool loadWaveTable (juce::OwnedArray<gin::BandLimitedLookupTable>& table, double sr, const juce::MemoryBlock& wav)
{
auto is = new juce::MemoryInputStream (wav, false);
if (auto reader = std::unique_ptr<juce::AudioFormatReader> (juce::WavAudioFormat().createReaderFor (is, true)))
{
juce::AudioSampleBuffer buf (1, int (reader->lengthInSamples));
reader->read (&buf, 0, int (reader->lengthInSamples), 0, true, false);
if (auto sz = gin::getWavetableSize (wav); sz > 0)
{
juce::AudioSampleBuffer buf (1, int (reader->lengthInSamples));
reader->read (&buf, 0, int (reader->lengthInSamples), 0, true, false);
loadWavetables (table, sr, buf, reader->sampleRate, gin::getWavetableSize (wav));
loadWavetables (table, sr, buf, reader->sampleRate, sz);
return true;
}
}
return false;
}
//==============================================================================
@ -430,13 +435,27 @@ void WavetableAudioProcessor::reloadWavetables()
if (sr == 0)
return;
if (auto mb = loadMemory (osc1Table.toString()); mb.getSize() > 0)
if (userTable1.getSize() > 0)
{
if (shouldLoad (0, osc1Table.toString(), sr))
loadWaveTable (osc1Tables, sr, userTable1);
}
else if (auto mb = loadMemory (osc1Table.toString()); mb.getSize() > 0)
{
if (shouldLoad (0, osc1Table.toString(), sr))
loadWaveTable (osc1Tables, sr, mb);
}
if (userTable2.getSize() > 0)
{
if (shouldLoad (0, osc2Table.toString(), sr))
loadWaveTable (osc2Tables, sr, userTable2);
}
if (auto mb = loadMemory (osc2Table.toString()); mb.getSize() > 0)
{
if (shouldLoad (1, osc2Table.toString(), sr))
loadWaveTable (osc2Tables, sr, mb);
}
}
void WavetableAudioProcessor::incWavetable (int osc, int delta)
@ -461,6 +480,22 @@ void WavetableAudioProcessor::incWavetable (int osc, int delta)
reloadWavetables();
}
void WavetableAudioProcessor::loadUserWavetable (int osc, const juce::File f)
{
auto& table = osc == 0 ? osc1Tables : osc2Tables;
auto& mb = osc == 0 ? userTable1 : userTable2;
auto& name = osc == 0 ? osc1Table : osc2Table;
juce::MemoryBlock raw;
f.loadFileAsData (raw);
if (loadWaveTable (table, gin::Processor::getSampleRate(), raw))
{
mb = raw;
name = f.getFileNameWithoutExtension();
}
}
//==============================================================================
void WavetableAudioProcessor::stateUpdated()
{
@ -469,6 +504,9 @@ void WavetableAudioProcessor::stateUpdated()
osc1Table = state.getProperty ("wt1");
osc2Table = state.getProperty ("wt2");
userTable1.fromBase64Encoding (state.getProperty ("wt1Data").toString());
userTable2.fromBase64Encoding (state.getProperty ("wt2Data").toString());
reloadWavetables();
}
@ -478,6 +516,9 @@ void WavetableAudioProcessor::updateState()
state.setProperty ("wt1", osc1Table, nullptr);
state.setProperty ("wt2", osc2Table, nullptr);
state.setProperty ("wt1Data", userTable1.toBase64Encoding(), nullptr);
state.setProperty ("wt2Data", userTable2.toBase64Encoding(), nullptr);
}
//==============================================================================

2
plugin/Source/PluginProcessor.h
View file

@ -39,6 +39,7 @@ public:
void reloadWavetables();
void incWavetable (int osc, int delta);
void loadUserWavetable (int osc, const juce::File f);
void applyEffects (juce::AudioSampleBuffer& buffer);
@ -256,6 +257,7 @@ public:
gin::BandLimitedLookupTables analogTables;
juce::Value osc1Table, osc2Table;
juce::MemoryBlock userTable1, userTable2;
//==============================================================================
gin::ModMatrix modMatrix;