mirror of
https://codeberg.org/armin/wavetable.git
synced 2026-09-01 05:50:46 +02:00
Update gin
This commit is contained in:
parent
b4596166da
commit
b78d6b332e
4 changed files with 10 additions and 10 deletions
|
|
@ -1 +1 @@
|
|||
Subproject commit 2908dd915b06cf1f1ea8ff57ea9a57685940fbfb
|
||||
Subproject commit 70a782087eeb4de81865fd0dbfc4c30a2473255b
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 60a19f52647449e2e0083b8bfcb21ba87f13724c
|
||||
Subproject commit 2efd3e066102b7f8d4928f8095fddc182b982da8
|
||||
|
|
@ -1144,7 +1144,7 @@ void WavetableAudioProcessor::updateParams (int newBlockSize)
|
|||
outputGain.setGain (modMatrix.getValue (globalParams.level));
|
||||
}
|
||||
|
||||
bool WavetableAudioProcessor::loadWaveTable (juce::OwnedArray<gin::BandLimitedLookupTable>& table, double sr, const juce::MemoryBlock& wav, const juce::String& format, int size)
|
||||
bool WavetableAudioProcessor::loadWaveTable (gin::Wavetable& table, double sr, const juce::MemoryBlock& wav, const juce::String& format, int size)
|
||||
{
|
||||
auto is = new juce::MemoryInputStream (wav, false);
|
||||
|
||||
|
|
@ -1165,7 +1165,7 @@ bool WavetableAudioProcessor::loadWaveTable (juce::OwnedArray<gin::BandLimitedLo
|
|||
juce::AudioSampleBuffer buf (1, samplesToUse);
|
||||
reader->read (&buf, 0, samplesToUse, 0, true, false);
|
||||
|
||||
juce::OwnedArray<gin::BandLimitedLookupTable> t;
|
||||
gin::Wavetable t;
|
||||
loadWavetables (t, sr, buf, reader->sampleRate, size);
|
||||
|
||||
juce::ScopedLock sl (dspLock);
|
||||
|
|
@ -1182,12 +1182,12 @@ bool WavetableAudioProcessor::loadWaveTable (juce::OwnedArray<gin::BandLimitedLo
|
|||
juce::AudioSampleBuffer buf (1, int (reader->lengthInSamples));
|
||||
reader->read (&buf, 0, int (reader->lengthInSamples), 0, true, false);
|
||||
|
||||
juce::OwnedArray<gin::BandLimitedLookupTable> t;
|
||||
gin::Wavetable t;
|
||||
loadWavetables (t, sr, buf, reader->sampleRate, 2048);
|
||||
|
||||
|
||||
juce::ScopedLock sl (dspLock);
|
||||
std::swap (t, table);
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ public:
|
|||
void applyEffects (juce::AudioSampleBuffer& buffer);
|
||||
void applyEffect (juce::AudioSampleBuffer& buffer, int fxId);
|
||||
|
||||
bool loadWaveTable (juce::OwnedArray<gin::BandLimitedLookupTable>& table, double sr, const juce::MemoryBlock& wav, const juce::String& format, int size);
|
||||
bool loadWaveTable (gin::Wavetable& table, double sr, const juce::MemoryBlock& wav, const juce::String& format, int size);
|
||||
|
||||
// Voice Params
|
||||
struct OSCParams
|
||||
|
|
@ -317,8 +317,8 @@ public:
|
|||
FireAmp fireAmp;
|
||||
GrindAmp grindAmp;
|
||||
|
||||
juce::OwnedArray<gin::BandLimitedLookupTable> osc1Tables;
|
||||
juce::OwnedArray<gin::BandLimitedLookupTable> osc2Tables;
|
||||
gin::Wavetable osc1Tables;
|
||||
gin::Wavetable osc2Tables;
|
||||
|
||||
gin::BandLimitedLookupTables analogTables;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue