diff layer/SpectrogramLayer.h @ 113:7a23edd831cb

* Various fft server improvements, including the ability to pick out data from
  an existing fft cache at a smaller increment or larger fft size rather than
  recalculating it (if appropriate)

--- a/layer/SpectrogramLayer.h	Wed Jun 28 15:42:04 2006 +0000
+++ b/layer/SpectrogramLayer.h	Thu Jun 29 16:16:49 2006 +0000
@@ -22,6 +22,7 @@
 #include "base/Thread.h"
 #include "model/PowerOfSqrtTwoZoomConstraint.h"
 #include "model/DenseTimeValueModel.h"
+#include "fileio/FFTDataServer.h"
 
 #include <QMutex>
 #include <QWaitCondition>
@@ -33,7 +34,6 @@
 class QImage;
 class QPixmap;
 class QTimer;
-class FFTDataServer;
 
 /**
  * SpectrogramLayer represents waveform data (obtained from a
@@ -308,6 +308,40 @@
         else if (m_windowHopLevel == 1) return (m_windowSize * 3) / 4;
         else return m_windowSize / (1 << (m_windowHopLevel - 1));
     }
+
+    size_t getFFTWidth() const {
+        return m_fftServer->getWidth(getWindowIncrement(), m_fftSize);
+    }
+    size_t getFFTHeight() const {
+        return m_fftServer->getHeight(getWindowIncrement(), m_fftSize);
+    }
+    float getFFTMagnitudeAt(size_t x, size_t y) const {
+        return m_fftServer->getMagnitudeAt(getWindowIncrement(), m_fftSize,
+                                              x, y);
+    }
+    float getFFTNormalizedMagnitudeAt(size_t x, size_t y) const {
+        return m_fftServer->getNormalizedMagnitudeAt(getWindowIncrement(), m_fftSize,
+                                                     x, y);
+    }
+    float getFFTPhaseAt(size_t x, size_t y) const {
+        return m_fftServer->getPhaseAt(getWindowIncrement(), m_fftSize,
+                                       x, y);
+    }
+    void getFFTValuesAt(size_t x, size_t y, float &real, float &imag) const {
+        m_fftServer->getValuesAt(getWindowIncrement(), m_fftSize,
+                                 x, y, real, imag);
+    }
+    bool isFFTLocalPeak(size_t x, size_t y) const {
+        return m_fftServer->isLocalPeak(getWindowIncrement(), m_fftSize,
+                                        x, y);
+    }
+    bool isFFTOverThreshold(size_t x, size_t y, float threshold) const {
+        return m_fftServer->isOverThreshold(getWindowIncrement(), m_fftSize,
+                                            x, y, threshold);
+    }
+    bool isFFTColumnReady(size_t x) const {
+        return m_fftServer->isColumnReady(getWindowIncrement(), m_fftSize, x);
+    }
 };
 
 #endif