comparison plugins/AdaptiveSpectrogram.cpp @ 106:35f2138c6891

* Update to new FFT api

     for (int i = 0; i < m_cutThreads.size(); ++i) {
         delete m_cutThreads[i];
     }
     m_cutThreads.clear();
 
-    for (int i = 0; i < m_fftThreads.size(); ++i) {
-        delete m_fftThreads[i];
+    for (FFTMap::iterator i = m_fftThreads.begin(); i != m_fftThreads.end(); ++i) {
+        delete i->second;
     }
     m_fftThreads.clear();
 }
 
 string

 AdaptiveSpectrogram::initialise(size_t channels, size_t stepSize, size_t blockSize)
 {
     if (channels < getMinChannelCount() ||
 	channels > getMaxChannelCount()) return false;
 
-    while (m_fftThreads.size() < (m_n + 1)) {
-        m_fftThreads.push_back(new FFTThread());
-    }
-    
     return true;
 }
 
 void
 AdaptiveSpectrogram::reset()

 
     int w = minwid;
     int index = 0;
 
     while (w <= maxwid) {
-        m_fftThreads[index]->calculate(inputBuffers[0], s, index, w, maxwid);
+        if (m_fftThreads.find(w) == m_fftThreads.end()) {
+            m_fftThreads[w] = new FFTThread(w);
+        }
+        m_fftThreads[w]->calculate(inputBuffers[0], s, index, maxwid);
         w *= 2;
         ++index;
     }
 
     w = minwid;
-    index = 0;
-
     while (w <= maxwid) {
-        m_fftThreads[index]->await();
+        m_fftThreads[w]->await();
         w *= 2;
-        ++index;
     }
 
     m_first = true;//!!!
 
     Cutting *cutting = cut(s, maxwid/2, 0, 0, maxwid/2);