comparison data/fft/FFTDataServer.h @ 549:388afa99d537

* More careful (I hope!) locking

     
     StorageAdviser::Criteria m_criteria;
 
     void getStorageAdvice(size_t w, size_t h, bool &memory, bool &compact);
         
-    QMutex m_writeMutex;
+    QMutex m_fftBuffersLock;
     QWaitCondition m_condition;
 
     fftsample *m_fftInput;
     fftf_complex *m_fftOutput;
     float *m_workbuffer;

     bool m_exiting;
     bool m_suspended;
     FillThread *m_fillThread;
 
     void deleteProcessingData();
-    void fillColumn(size_t x, bool lockHeld);
+    void fillColumn(size_t x, FFTCacheReader *tester = 0);
     void fillComplete();
 
     QString generateFileBasename() const;
     static QString generateFileBasename(const DenseTimeValueModel *model,
                                         int channel,