comparison plugins/TonalChangeDetect.cpp @ 15:3b02e26b23ff

* Make sure we have correct step/block sizes available even if the methods
  to query them haven't been called

         channels > getMaxChannelCount()) {
         std::cerr << "TonalChangeDetect::initialise: Given channel count " << channels << " outside acceptable range (" << getMinChannelCount() << " to " << getMaxChannelCount() << ")" << std::endl;
         return false;
     }
 	
+    m_chromagram = new Chromagram(m_config);
+    m_step = m_chromagram->getHopSize();
+    m_block = m_chromagram->getFrameSize();
+
     if (stepSize != m_step) {
         std::cerr << "TonalChangeDetect::initialise: Given step size " << stepSize << " differs from only acceptable value " << m_step << std::endl;
+        delete m_chromagram;
+        m_chromagram = 0;
         return false;
     }
     if (blockSize != m_block) {
         std::cerr << "TonalChangeDetect::initialise: Given step size " << stepSize << " differs from only acceptable value " << m_step << std::endl;
+        delete m_chromagram;
+        m_chromagram = 0;
         return false;
     }
 	
     //    m_stepDelay = (blockSize - stepSize) / 2;
     //    m_stepDelay = m_stepDelay / stepSize;
     m_stepDelay = (blockSize - stepSize) / stepSize; //!!! why? seems about right to look at, but...
 	
     std::cerr << "TonalChangeDetect::initialise: step " << stepSize << ", block "
               << blockSize << ", delay " << m_stepDelay << std::endl;
-	
-    m_chromagram = new Chromagram(m_config);
 	
     m_vaCurrentVector.resize(12, 0.0);
 	
     return true;