diff layer/SpectrumLayer.cpp @ 977:f40ccbf228c2 3.0-integration

Merge from branch simple-fft-model
author Chris Cannam
date Fri, 26 Jun 2015 14:10:18 +0100
parents b8187c83b93a
children 64c2b3a4435a
line wrap: on
line diff
--- a/layer/SpectrumLayer.cpp	Fri Jun 12 12:24:21 2015 +0100
+++ b/layer/SpectrumLayer.cpp	Fri Jun 26 14:10:18 2015 +0100
@@ -112,11 +112,7 @@
                                     m_windowType,
                                     m_windowSize,
                                     getWindowIncrement(),
-                                    m_windowSize,
-                                    false,
-                                    StorageAdviser::Criteria
-                                    (StorageAdviser::SpeedCritical |
-                                     StorageAdviser::FrequentLookupLikely));
+                                    m_windowSize);
 
     setSliceableModel(newFFT);
 
@@ -125,8 +121,6 @@
         m_biasCurve.push_back(1.f / (float(m_windowSize)/2.f));
     }
 
-    newFFT->resume();
-
     m_newFFTNeeded = false;
 }