comparison data/fft/FFTMemoryCache.h @ 548:1469caaa8e67

* Finer locking in fft caches; fix displayed bin ranges in spectrogram

 #include "FFTCacheWriter.h"
 #include "FFTCacheStorageType.h"
 #include "base/ResizeableBitset.h"
 #include "base/Profiler.h"
 
-#include <QMutex>
+#include <QReadWriteLock>
 
 /**
  * In-memory FFT cache.  For this we want to cache magnitude with
  * enough resolution to have gain applied afterwards and determine
  * whether something is a peak or not, and also cache phase rather

             }
         }
     }
 
     bool haveSetColumnAt(size_t x) const {
-        m_colsetMutex.lock();
+        m_colsetLock.lockForRead();
         bool have = m_colset.get(x);
-        m_colsetMutex.unlock();
+        m_colsetLock.unlock();
         return have;
     }
 
     void setColumnAt(size_t x, float *mags, float *phases, float factor);
 

     float **m_freal;
     float **m_fimag;
     float *m_factor;
     FFTCache::StorageType m_storageType;
     ResizeableBitset m_colset;
-    mutable QMutex m_colsetMutex;
+    mutable QReadWriteLock m_colsetLock;
 
     void initialise();
 
     void setNormalizationFactor(size_t x, float factor) {
         if (x < m_width) m_factor[x] = factor;