comparison layer/SpectrumLayer.h @ 374:64e84e5efb76 spectrogram-cache-rejig

* Merge from trunk

 #include "base/Window.h"
 
 #include "data/model/DenseTimeValueModel.h"
 
 #include <QColor>
+#include <QMutex>
 
 class FFTModel;
 
 class SpectrumLayer : public SliceLayer
 {

 	return PositionTop;
     }
 
     virtual PropertyList getProperties() const;
     virtual QString getPropertyLabel(const PropertyName &) const;
+    virtual QString getPropertyIconName(const PropertyName &) const;
     virtual PropertyType getPropertyType(const PropertyName &) const;
     virtual QString getPropertyGroupName(const PropertyName &) const;
     virtual int getPropertyRangeAndValue(const PropertyName &,
                                          int *min, int *max, int *deflt) const;
     virtual QString getPropertyValueLabel(const PropertyName &,

     WindowType              m_windowType;
     size_t                  m_windowHopLevel;
     bool                    m_showPeaks;
     mutable bool            m_newFFTNeeded;
 
+    mutable QMutex m_fftMutex;
+
     void setupFFT();
 
     virtual void getBiasCurve(BiasCurve &) const;
     BiasCurve m_biasCurve;