comparison src/Silvet.cpp @ 145:450f9987f041

Update CQ implementation following inverse-CQ merge

 
 #include "maths/MedianFilter.h"
 #include "maths/MathUtilities.h"
 #include "dsp/rateconversion/Resampler.h"
 
-#include "constant-q-cpp/cpp-qm-dsp/CQInterpolated.h"
+#include "constant-q-cpp/cpp-qm-dsp/CQSpectrogram.h"
 
 #include <vector>
 
 #include <cstdio>
 

 	m_resampler = new Resampler(m_inputSampleRate, processingSampleRate);
     } else {
 	m_resampler = 0;
     }
 
-    m_cq = new CQInterpolated
+    m_cq = new CQSpectrogram
 	(processingSampleRate, 27.5, processingSampleRate / 3, processingBPO,
-         CQInterpolated::Linear);
+         CQSpectrogram::InterpolateLinear);
 
     for (int i = 0; i < (int)m_postFilter.size(); ++i) {
         delete m_postFilter[i];
     }
     m_postFilter.clear();

 }
 
 Silvet::FeatureSet
 Silvet::getRemainingFeatures()
 {
-    Grid cqout = m_cq->getRemainingBlocks();
+    Grid cqout = m_cq->getRemainingOutput();
     FeatureSet fs = transcribe(cqout);
 
     for (int i = 0; i < (int)cqout.size(); ++i) {
         Feature f;
         for (int j = 0; j < (int)cqout[i].size(); ++j) {