comparison src/ConstantQ.cpp @ 127:8996465e39fc

Expose some more processing parameters, use a single parameter class

 using std::cerr;
 using std::endl;
 
 //#define DEBUG_CQ 1
 
-ConstantQ::ConstantQ(double sampleRate,
-                     double minFreq,
-                     double maxFreq,
-                     int binsPerOctave) :
-    m_sampleRate(sampleRate),
-    m_maxFrequency(maxFreq),
-    m_minFrequency(minFreq),
-    m_binsPerOctave(binsPerOctave),
+ConstantQ::ConstantQ(CQParameters params) :
+    m_inparams(params),
+    m_sampleRate(params.sampleRate),
+    m_maxFrequency(params.maxFrequency),
+    m_minFrequency(params.minFrequency),
+    m_binsPerOctave(params.binsPerOctave),
     m_fft(0)
 {
-    if (minFreq <= 0.0 || maxFreq <= 0.0) {
+    if (m_minFrequency <= 0.0 || m_maxFrequency <= 0.0) {
         throw std::invalid_argument("Frequency extents must be positive");
     }
 
     initialise();
 }

 
 void
 ConstantQ::initialise()
 {
     m_octaves = int(ceil(log2(m_maxFrequency / m_minFrequency)));
-    m_kernel = new CQKernel(m_sampleRate, m_maxFrequency, m_binsPerOctave);
+    m_kernel = new CQKernel(m_inparams);
     m_p = m_kernel->getProperties();
     
     // Use exact powers of two for resampling rates. They don't have
     // to be related to our actual samplerate: the resampler only
     // cares about the ratio, but it only accepts integer source and