Merge branch 'develop' of https://github.com/Torsion-Audio/Scyclone i…

…nto develop

CMakeLists.txt

@@ -182,6 +182,7 @@ target_link_libraries(${TARGET_NAME}
 		juce::juce_graphics
 		juce::juce_gui_basics
 		juce::juce_gui_extra
+		juce::juce_audio_basics
 		onnxruntime
 
 		PUBLIC

source/PluginProcessor.cpp

@@ -23,7 +23,7 @@ AudioPluginAudioProcessor::AudioPluginAudioProcessor()
         grainDelay1(1),
         grainDelay2(2),
         processorCompressor(parameters)
-{
+{       
 
     network1Name = "Funk";
     network2Name = "Djembe";
@@ -169,6 +169,7 @@ void AudioPluginAudioProcessor::prepareToPlay (double sampleRate, int samplesPer
 void AudioPluginAudioProcessor::releaseResources() {
     // When playback stops, you can use this as an opportunity to free up any
     // spare memory, etc.
+    measurer.reset();
 }
 
 bool AudioPluginAudioProcessor::isBusesLayoutSupported (const BusesLayout& layouts) const {
@@ -195,9 +196,8 @@ bool AudioPluginAudioProcessor::isBusesLayoutSupported (const BusesLayout& layou
 
 void AudioPluginAudioProcessor::processBlock (juce::AudioBuffer<float>& buffer,
                                               juce::MidiBuffer& ) {
-    juce::AudioProcessLoadMeasurer::ScopedTimer s(measurer);
+    juce::AudioProcessLoadMeasurer::ScopedTimer s(measurer, buffer.getNumSamples());
     {
-
         dryWetMixer.setDrySamples(buffer);
         stereoToMono(monoBuffer, buffer);
 

source/PluginProcessor.h

@@ -11,6 +11,7 @@
 #include "dsp/gain/ProcessorGain.h"
 #include "dsp/Filter/IIRCutoffFilter.h"
 #include "dsp/grainDelay/GrainDelay.h"
+//#include <audio_basics/buffers/juce_AudioProcessLoadMeasurer.h>
 
 
 //==============================================================================
@@ -123,6 +124,8 @@
 
     float latency;
 
+
+
     //==============================================================================
     JUCE_HEAVYWEIGHT_LEAK_DETECTOR (AudioPluginAudioProcessor)
 };

source/ui/CustomComponents/Footer/FooterComponent.cpp

@@ -60,7 +60,7 @@ void FooterComponent::updateSpecs(){
     latencySeconds = (float)latencySamples / float(sampleRate);
 
     //processorUse = processor.getCpuLoad();
-    processorUse = systemSpecs.getCPULoad();
+    processorUse = processor.getCpuLoad();
 
     std::string cpuString = "CPU: " + std::to_string((int)processorUse ) + " %";
     cpuLabel.setText(cpuString, juce::dontSendNotification);

source/ui/CustomComponents/Footer/FooterComponent.h

@@ -9,7 +9,6 @@
 #include "../../../PluginParameters.h"
 #include "../../../PluginProcessor.h"
 #include "../../../ui/LookAndFeel/CustomFontLookAndFeel.h"
-#include "../../../utils/SystemSpecs.h"
 
 class FooterComponent : public juce::Component, juce::Timer {
 public:
@@ -39,8 +38,6 @@ class FooterComponent : public juce::Component, juce::Timer {
     CustomFontLookAndFeel customFontLookAndFeel;
     juce::Font font;
 
-    SystemSpecs systemSpecs;
-
 };
 
 

source/ui/CustomComponents/XYPad/XYPad.cpp

@@ -102,12 +102,7 @@ void XYPad::resized()
 
 void XYPad::parameterChanged(const juce::String& parameterID, float newValue)
 {
-    if (parameterID == PluginParameters::SELECT_NETWORK1_ID.getParamID() && newValue == 0.f) {
-        updateKnobName(1, network1Name);
-    } else if (parameterID == PluginParameters::SELECT_NETWORK2_ID.getParamID() && newValue == 0.f) {
-        updateKnobName(2, network2Name);
-    }
-
+
     if (parameterID == PluginParameters::FADE_ID.getParamID()){
         float fadeValue = parameters.getRawParameterValue(PluginParameters::FADE_ID.getParamID())->load();
         onModelMixChange(fadeValue);