updated fft objects to new code

d3cod3 · d3cod3 · commit a68df9775b25 · 2025-04-14T17:37:46.000+01:00
diff --git a/src/objects/audio_analysis/AudioAnalyzer.cpp b/src/objects/audio_analysis/AudioAnalyzer.cpp
@@ -316,10 +316,15 @@ void AudioAnalyzer::loadAudioSettings(){
     beatTrack->setConfidentThreshold(0.35);
 
     // Audio Analysis
-    fft = ofxFft::create(bufferSize, OF_FFT_WINDOW_HAMMING);
+    fft = new ofxVP::Fft();
+    fft->setup(bufferSize);
 
-    fftBinSize              = fft->getBinSize();
-    fft_binSizeHz           = ((sampleRate/2)/(fftBinSize-1));
+    fftBinSize              = (bufferSize / 2) + 1;
+    // avoid division by 0
+    if(fftBinSize<=1){
+        fftBinSize = 2;
+    }
+    fft_binSizeHz           = (sampleRate/2)/(fftBinSize-1);
     fft_StrongestBinValue   = 0.0f;
     fft_StrongestBinIndex	= 0;
     fft_pitchBin			= 0;
diff --git a/src/objects/audio_analysis/AudioAnalyzer.h b/src/objects/audio_analysis/AudioAnalyzer.h
@@ -36,7 +36,7 @@
 
 #include "PatchObject.h"
 
-#include "ofxFft.h"
+#include "ofxVPFFT.h"
 #include "ofxBTrack.h"
 
 #include "imgui_plot.h"
@@ -82,7 +82,7 @@ class AudioAnalyzer : public PatchObject {
     std::mutex                              audioMutex;
 
     // Analysis variables
-    ofxFft                                  *fft;
+    ofxVP::Fft                              *fft;
     ofxBTrack                               *beatTrack;
 
     float                                   *plot_data;
diff --git a/src/objects/sound/pdspParametricEQ.cpp b/src/objects/sound/pdspParametricEQ.cpp
@@ -340,7 +340,8 @@ void pdspParametricEQ::loadAudioSettings(){
     sampleRate = this->ofxVPXml.getMosaicConfigInt("sample_rate_in");
     bufferSize = this->ofxVPXml.getMosaicConfigInt("buffer_size");
 
-    fft = ofxFft::create(bufferSize, OF_FFT_WINDOW_HAMMING);
+    fft = new ofxVP::Fft();
+    fft->setup(bufferSize);
     spectrum = new float[fft->getBinSize()];
     l1Filter = new std::vector<float>;
     m1Filter = new std::vector<float>;
diff --git a/src/objects/sound/pdspParametricEQ.h b/src/objects/sound/pdspParametricEQ.h
@@ -36,7 +36,7 @@
 
 #include "PatchObject.h"
 
-#include "ofxFft.h"
+#include "ofxVPFFT.h"
 
 #include "imgui_plot.h"
 #include "imgui-knobs.h"
@@ -65,7 +65,7 @@ class pdspParametricEQ : public PatchObject{
     void            loadAudioSettings();
 
 
-    ofxFft                  *fft;
+    ofxVP::Fft              *fft;
     float                   *spectrum;
 
     pdsp::Scope             scope;
