From b78d6b332e37100eb8e924fb6f190a7af297b3ac Mon Sep 17 00:00:00 2001 From: Roland Rabien Date: Thu, 13 Nov 2025 20:10:21 -0800 Subject: [PATCH] Update gin --- modules/gin | 2 +- modules/juce | 2 +- plugin/Source/PluginProcessor.cpp | 10 +++++----- plugin/Source/PluginProcessor.h | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/gin b/modules/gin index 2908dd9..70a7820 160000 --- a/modules/gin +++ b/modules/gin @@ -1 +1 @@ -Subproject commit 2908dd915b06cf1f1ea8ff57ea9a57685940fbfb +Subproject commit 70a782087eeb4de81865fd0dbfc4c30a2473255b diff --git a/modules/juce b/modules/juce index 60a19f5..2efd3e0 160000 --- a/modules/juce +++ b/modules/juce @@ -1 +1 @@ -Subproject commit 60a19f52647449e2e0083b8bfcb21ba87f13724c +Subproject commit 2efd3e066102b7f8d4928f8095fddc182b982da8 diff --git a/plugin/Source/PluginProcessor.cpp b/plugin/Source/PluginProcessor.cpp index efd3855..83eaae3 100644 --- a/plugin/Source/PluginProcessor.cpp +++ b/plugin/Source/PluginProcessor.cpp @@ -1144,7 +1144,7 @@ void WavetableAudioProcessor::updateParams (int newBlockSize) outputGain.setGain (modMatrix.getValue (globalParams.level)); } -bool WavetableAudioProcessor::loadWaveTable (juce::OwnedArray& 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::OwnedArrayread (&buf, 0, samplesToUse, 0, true, false); - juce::OwnedArray t; + gin::Wavetable t; loadWavetables (t, sr, buf, reader->sampleRate, size); juce::ScopedLock sl (dspLock); @@ -1182,12 +1182,12 @@ bool WavetableAudioProcessor::loadWaveTable (juce::OwnedArraylengthInSamples)); reader->read (&buf, 0, int (reader->lengthInSamples), 0, true, false); - juce::OwnedArray t; + gin::Wavetable t; loadWavetables (t, sr, buf, reader->sampleRate, 2048); - + juce::ScopedLock sl (dspLock); std::swap (t, table); - + return true; } } diff --git a/plugin/Source/PluginProcessor.h b/plugin/Source/PluginProcessor.h index 784f183..f23d7a6 100644 --- a/plugin/Source/PluginProcessor.h +++ b/plugin/Source/PluginProcessor.h @@ -56,7 +56,7 @@ public: void applyEffects (juce::AudioSampleBuffer& buffer); void applyEffect (juce::AudioSampleBuffer& buffer, int fxId); - bool loadWaveTable (juce::OwnedArray& 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 osc1Tables; - juce::OwnedArray osc2Tables; + gin::Wavetable osc1Tables; + gin::Wavetable osc2Tables; gin::BandLimitedLookupTables analogTables;