From fb59f3082e6356bf7ce355aabc1d08444f800c8a Mon Sep 17 00:00:00 2001 From: Paul Jones Date: Thu, 14 Mar 2024 13:53:36 -0400 Subject: [PATCH] 0.2.2 --- Blueprint.pkgproj | 4 ++-- Source/Components/PedalComponent.h | 4 ++-- Source/Components/TopComponent.h | 3 +-- Source/Components/TunerComponent.h | 4 ++-- Source/PluginAudioProcessor.cpp | 4 +--- Source/PluginUtils.h | 4 ++-- Source/Processors/Saturators/MouseDrive.h | 8 ++++---- Source/Processors/Saturators/TubeScreamer.h | 4 ++-- 8 files changed, 16 insertions(+), 19 deletions(-) diff --git a/Blueprint.pkgproj b/Blueprint.pkgproj index dad25cf..e0e52cd 100644 --- a/Blueprint.pkgproj +++ b/Blueprint.pkgproj @@ -61,9 +61,9 @@ GID 80 PATH - /Users/pljns/JUCE/projects/supertonal/Builds/Blueprint Cory Bergeron2 - AAX 2024-02-11 19-10-07/Products/Library/Application Support/Avid/Audio/Plug-Ins/Blueprint Cory Bergeron2.aaxplugin + Builds/2024-03-13 23-39-09 Blueprint Cory Bergeron2 - AAX/Products/Library/Application Support/Avid/Audio/Plug-Ins/Blueprint Cory Bergeron2.aaxplugin PATH_TYPE - 0 + 1 PERMISSIONS 493 TYPE diff --git a/Source/Components/PedalComponent.h b/Source/Components/PedalComponent.h index 4e2a4d7..66b0794 100644 --- a/Source/Components/PedalComponent.h +++ b/Source/Components/PedalComponent.h @@ -99,7 +99,7 @@ class PedalComponent : public juce::Component row1Count++; - if (mSliderPtrs.size() == 4 && row1Count == 2 || mSliderPtrs.size() > 4 && row1Count >= 3) + if ((mSliderPtrs.size() == 4 && row1Count == 2) || (mSliderPtrs.size() > 4 && row1Count >= 3)) { break; } @@ -157,4 +157,4 @@ class PedalComponent : public juce::Component // Additional toggle Button std::unique_ptr mAdditionalToggleButtonPtr; std::unique_ptr mAdditionalToggleButtonAttachmentPtr; -}; \ No newline at end of file +}; diff --git a/Source/Components/TopComponent.h b/Source/Components/TopComponent.h index 83d4155..9a404eb 100644 --- a/Source/Components/TopComponent.h +++ b/Source/Components/TopComponent.h @@ -120,7 +120,6 @@ class TopComponent : public juce::Component mViewportPtr->setBounds(localBounds); const int levelMeterWidth = 30; // Arbitrary width for the level meters - const int levelMeterSpacing = 10; // Space between the meters and the main content // Place the input level meter on the very left, spanning the full height. mInputLevelMeter.setBounds(0, 0, levelMeterWidth, localBounds.getHeight()); @@ -170,4 +169,4 @@ class TopComponent : public juce::Component foleys::LevelMeter mOutputLevelMeter{ foleys::LevelMeter::Minimal }; JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(TopComponent) -}; \ No newline at end of file +}; diff --git a/Source/Components/TunerComponent.h b/Source/Components/TunerComponent.h index 3fc6fb2..971adbb 100644 --- a/Source/Components/TunerComponent.h +++ b/Source/Components/TunerComponent.h @@ -96,7 +96,7 @@ class TunerPedalComponent : public juce::Component, private juce::Timer float mLastPitch; - void timerCallback() + void timerCallback() override { const auto newPitch = mAudioProcessorRef.getPitch(); if (newPitch != mLastPitch) @@ -113,4 +113,4 @@ class TunerPedalComponent : public juce::Component, private juce::Timer // Toggle Button std::unique_ptr mToggleButtonPtr; std::unique_ptr mToggleButtonAttachmentPtr; -}; \ No newline at end of file +}; diff --git a/Source/PluginAudioProcessor.cpp b/Source/PluginAudioProcessor.cpp index fb8fab6..3db31ea 100644 --- a/Source/PluginAudioProcessor.cpp +++ b/Source/PluginAudioProcessor.cpp @@ -980,10 +980,8 @@ void PluginAudioProcessor::processBlock(juce::AudioBuffer& buffer, juce:: const auto totalNumInputChannels = getTotalNumInputChannels(); const auto totalNumOutputChannels = getTotalNumOutputChannels(); const auto numSamples = buffer.getNumSamples(); - const auto samplesPerSecond = getSampleRate(); const double rawBeatsPerMinute = getPlayHead()->getPosition()->getBpm().orFallback(120); mBpmSmoothedValue.setTargetValue(rawBeatsPerMinute); - const auto smoothedBeatsPerMinute = mBpmSmoothedValue.skip(numSamples); if (mIsBypassOn) { @@ -1879,4 +1877,4 @@ bool PluginAudioProcessor::hasEditor() const juce::AudioProcessorEditor* PluginAudioProcessor::createEditor() { return new PluginAudioProcessorEditor(*this); -} \ No newline at end of file +} diff --git a/Source/PluginUtils.h b/Source/PluginUtils.h index b30b5b4..7d97ad0 100644 --- a/Source/PluginUtils.h +++ b/Source/PluginUtils.h @@ -56,7 +56,7 @@ class PluginUtils { int noteIndex = (nRounded + 9) % 12; if (noteIndex < 0) noteIndex += 12; - int octave = 4 + (nRounded + 9) / 12; + //int octave = 4 + (nRounded + 9) / 12; float nearestNoteFrequency = referenceA4 * pow(2.0, nRounded / 12.0); @@ -64,4 +64,4 @@ class PluginUtils { return { noteNames[noteIndex], cents }; } -}; \ No newline at end of file +}; diff --git a/Source/Processors/Saturators/MouseDrive.h b/Source/Processors/Saturators/MouseDrive.h index 124415d..180fded 100644 --- a/Source/Processors/Saturators/MouseDrive.h +++ b/Source/Processors/Saturators/MouseDrive.h @@ -41,11 +41,11 @@ class MouseDrive static inline const juce::NormalisableRange filterNormalisableRange = { 20.0f, 20000.0f, - [=](float start, float end, float normalised) + [](float start, float end, float normalised) { return start + (std::exp2(normalised * 6.0f) - 1) * (end - start) / (std::exp2(6.0f) - 1); }, - [=](float start, float end, float unnormalised) + [](float start, float end, float unnormalised) { return std::log2(((unnormalised - start) / (end - start) * (std::exp2(6.0f) - 1)) + 1) / 6.0f; } @@ -55,11 +55,11 @@ class MouseDrive static inline const juce::NormalisableRange volumeNormalisableRange = { -64.0f, 0.0f, - [=](float min, float max, float normalised) // convertFrom0to1 + [](float min, float max, float normalised) // convertFrom0to1 { return normalised * (max - min) + min; }, - [=](float min, float max, float unnormalised) // convertTo0to1 + [](float min, float max, float unnormalised) // convertTo0to1 { return (unnormalised - min) / (max - min); } diff --git a/Source/Processors/Saturators/TubeScreamer.h b/Source/Processors/Saturators/TubeScreamer.h index 01d8804..9318a81 100644 --- a/Source/Processors/Saturators/TubeScreamer.h +++ b/Source/Processors/Saturators/TubeScreamer.h @@ -38,11 +38,11 @@ class TubeScreamer static inline const juce::NormalisableRange levelNormalisableRange = { -64.0f, 0.0f, - [=](float min, float max, float normalised) // convertFrom0to1 + [](float min, float max, float normalised) // convertFrom0to1 { return normalised * (max - min) + min; }, - [=](float min, float max, float unnormalised) // convertTo0to1 + [](float min, float max, float unnormalised) // convertTo0to1 { return (unnormalised - min) / (max - min); }