comparison layer/SpectrogramLayer.h @ 130:10eec0da9efe last-cc-copyright

* Move the current DenseThreeDimensionalModel to EditableDenseThreeDimensionalModel
  (wow!), and make DTDM an abstract base
* Move FFTFuzzyAdapter to FFTModel as a new subclass of DTDM

 #include "base/RealTime.h"
 #include "base/Thread.h"
 #include "base/PropertyContainer.h"
 #include "data/model/PowerOfSqrtTwoZoomConstraint.h"
 #include "data/model/DenseTimeValueModel.h"
-
-#include "data/fft/FFTFuzzyAdapter.h"
+#include "data/model/FFTModel.h"
 
 #include <QMutex>
 #include <QWaitCondition>
 #include <QImage>
 #include <QPixmap>

 class View;
 class QPainter;
 class QImage;
 class QPixmap;
 class QTimer;
-class FFTFuzzyAdapter;
+class FFTModel;
 
 
 /**
  * SpectrogramLayer represents waveform data (obtained from a
  * DenseTimeValueModel) in spectrogram form.

         else return m_windowSize / (1 << (m_windowHopLevel - 1));
     }
 
     size_t getZeroPadLevel(const View *v) const;
     size_t getFFTSize(const View *v) const;
-    FFTFuzzyAdapter *getFFTAdapter(const View *v) const;
-    void invalidateFFTAdapters();
-
-    typedef std::pair<FFTFuzzyAdapter *, int> FFTFillPair; // adapter, last fill
+    FFTModel *getFFTModel(const View *v) const;
+    void invalidateFFTModels();
+
+    typedef std::pair<FFTModel *, int> FFTFillPair; // model, last fill
     typedef std::map<const View *, FFTFillPair> ViewFFTMap;
     typedef std::vector<float> FloatVector;
-    mutable ViewFFTMap m_fftAdapters;
+    mutable ViewFFTMap m_fftModels;
 
     class MagnitudeRange {
     public:
         MagnitudeRange() : m_min(0), m_max(0) { }
         bool operator==(const MagnitudeRange &r) {