# HG changeset patch
# User Chris Cannam
# Date 1435324240 -3600
# Node ID 64c2b3a4435a691a0c3a800b4c1f2a6dc4e02988
# Parent  f40ccbf228c221d5d6b2b83fad09f62bc7bd64b3# Parent  bc23c2cfff65112d2ed31ee870aff45e5fcae079
Merge from branch osx-retina

diff -r bc23c2cfff65 -r 64c2b3a4435a layer/SpectrogramLayer.cpp
--- a/layer/SpectrogramLayer.cpp	Wed Jun 10 14:27:55 2015 +0100
+++ b/layer/SpectrogramLayer.cpp	Fri Jun 26 14:10:40 2015 +0100
@@ -1633,10 +1633,7 @@
                                        m_windowType,
                                        m_windowSize,
                                        getWindowIncrement(),
-                                       fftSize,
-                                       true, // polar
-                                       StorageAdviser::SpeedCritical,
-                                       m_candidateFillStartFrame);
+                                       fftSize);
 
         if (!model->isOK()) {
             QMessageBox::critical
@@ -1658,8 +1655,6 @@
 
         m_fftModels[view] = FFTFillPair(model, 0);
 
-        model->resume();
-        
         delete m_updateTimer;
         m_updateTimer = new QTimer((SpectrogramLayer *)this);
         connect(m_updateTimer, SIGNAL(timeout()),
@@ -2453,8 +2448,6 @@
         (void)gettimeofday(&tv, 0);
         m_lastPaintTime = RealTime::fromTimeval(tv) - mainPaintStart;
     }
-
-//!!!    if (fftSuspended) fft->resume();
 }
 
 bool
diff -r bc23c2cfff65 -r 64c2b3a4435a layer/SpectrumLayer.cpp
--- a/layer/SpectrumLayer.cpp	Wed Jun 10 14:27:55 2015 +0100
+++ b/layer/SpectrumLayer.cpp	Fri Jun 26 14:10:40 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;
 }
 
diff -r bc23c2cfff65 -r 64c2b3a4435a widgets/WindowShapePreview.cpp
--- a/widgets/WindowShapePreview.cpp	Wed Jun 10 14:27:55 2015 +0100
+++ b/widgets/WindowShapePreview.cpp	Fri Jun 26 14:10:40 2015 +0100
@@ -209,7 +209,6 @@
 void
 WindowShapePreview::setWindowType(WindowType type)
 {
-    if (m_windowType == type) return;
     m_windowType = type;
     updateLabels();
 }
diff -r bc23c2cfff65 -r 64c2b3a4435a widgets/WindowTypeSelector.cpp
--- a/widgets/WindowTypeSelector.cpp	Wed Jun 10 14:27:55 2015 +0100
+++ b/widgets/WindowTypeSelector.cpp	Fri Jun 26 14:10:40 2015 +0100
@@ -78,7 +78,9 @@
 
     connect(m_windowCombo, SIGNAL(currentIndexChanged(int)),
             this, SLOT(windowIndexChanged(int)));
-    windowIndexChanged(index);
+
+    m_windowType = defaultType;
+    m_windowShape->setWindowType(m_windowType);
 }
 
 WindowTypeSelector::~WindowTypeSelector()