Mercurial > hg > constant-q-cpp

diff vamp/CQChromaVamp.cpp @ 127:8996465e39fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Expose some more processing parameters, use a single parameter class
author Chris Cannam <c.cannam@qmul.ac.uk>
date Fri, 16 May 2014 10:12:03 +0100
parents 2375457f2876
children ca3620c9a763
line wrap: on
line diff
--- a/vamp/CQChromaVamp.cpp	Fri May 16 09:06:34 2014 +0100
+++ b/vamp/CQChromaVamp.cpp	Fri May 16 10:12:03 2014 +0100
@@ -228,9 +228,8 @@
          << ", min freq " << m_minFrequency << ", max freq " << m_maxFrequency
          << endl;
 
-    m_cq = new CQSpectrogram
-	(m_inputSampleRate, m_minFrequency, m_maxFrequency, m_bpo,
-         CQSpectrogram::InterpolateLinear);
+    CQParameters p(m_inputSampleRate, m_minFrequency, m_maxFrequency, m_bpo);
+    m_cq = new CQSpectrogram(p, CQSpectrogram::InterpolateLinear);
 
     return true;
 }
@@ -240,9 +239,8 @@
 {
     if (m_cq) {
 	delete m_cq;
-	m_cq = new CQSpectrogram
-	    (m_inputSampleRate, m_minFrequency, m_maxFrequency, m_bpo,
-             CQSpectrogram::InterpolateLinear);
+        CQParameters p(m_inputSampleRate, m_minFrequency, m_maxFrequency, m_bpo);
+        m_cq = new CQSpectrogram(p, CQSpectrogram::InterpolateLinear);
     }
     m_haveStartTime = false;
     m_columnCount = 0;