Skip to content

Commit b78d6b3

Browse files
committed
Update gin
1 parent b459616 commit b78d6b3

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

modules/gin

Submodule gin updated 73 files

modules/juce

Submodule juce updated 985 files

plugin/Source/PluginProcessor.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1144,7 +1144,7 @@ void WavetableAudioProcessor::updateParams (int newBlockSize)
11441144
outputGain.setGain (modMatrix.getValue (globalParams.level));
11451145
}
11461146

1147-
bool WavetableAudioProcessor::loadWaveTable (juce::OwnedArray<gin::BandLimitedLookupTable>& table, double sr, const juce::MemoryBlock& wav, const juce::String& format, int size)
1147+
bool WavetableAudioProcessor::loadWaveTable (gin::Wavetable& table, double sr, const juce::MemoryBlock& wav, const juce::String& format, int size)
11481148
{
11491149
auto is = new juce::MemoryInputStream (wav, false);
11501150

@@ -1165,7 +1165,7 @@ bool WavetableAudioProcessor::loadWaveTable (juce::OwnedArray<gin::BandLimitedLo
11651165
juce::AudioSampleBuffer buf (1, samplesToUse);
11661166
reader->read (&buf, 0, samplesToUse, 0, true, false);
11671167

1168-
juce::OwnedArray<gin::BandLimitedLookupTable> t;
1168+
gin::Wavetable t;
11691169
loadWavetables (t, sr, buf, reader->sampleRate, size);
11701170

11711171
juce::ScopedLock sl (dspLock);
@@ -1182,12 +1182,12 @@ bool WavetableAudioProcessor::loadWaveTable (juce::OwnedArray<gin::BandLimitedLo
11821182
juce::AudioSampleBuffer buf (1, int (reader->lengthInSamples));
11831183
reader->read (&buf, 0, int (reader->lengthInSamples), 0, true, false);
11841184

1185-
juce::OwnedArray<gin::BandLimitedLookupTable> t;
1185+
gin::Wavetable t;
11861186
loadWavetables (t, sr, buf, reader->sampleRate, 2048);
1187-
1187+
11881188
juce::ScopedLock sl (dspLock);
11891189
std::swap (t, table);
1190-
1190+
11911191
return true;
11921192
}
11931193
}

plugin/Source/PluginProcessor.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class WavetableAudioProcessor : public gin::Processor,
5656
void applyEffects (juce::AudioSampleBuffer& buffer);
5757
void applyEffect (juce::AudioSampleBuffer& buffer, int fxId);
5858

59-
bool loadWaveTable (juce::OwnedArray<gin::BandLimitedLookupTable>& table, double sr, const juce::MemoryBlock& wav, const juce::String& format, int size);
59+
bool loadWaveTable (gin::Wavetable& table, double sr, const juce::MemoryBlock& wav, const juce::String& format, int size);
6060

6161
// Voice Params
6262
struct OSCParams
@@ -317,8 +317,8 @@ class WavetableAudioProcessor : public gin::Processor,
317317
FireAmp fireAmp;
318318
GrindAmp grindAmp;
319319

320-
juce::OwnedArray<gin::BandLimitedLookupTable> osc1Tables;
321-
juce::OwnedArray<gin::BandLimitedLookupTable> osc2Tables;
320+
gin::Wavetable osc1Tables;
321+
gin::Wavetable osc2Tables;
322322

323323
gin::BandLimitedLookupTables analogTables;
324324

0 commit comments

Comments
 (0)