# HG changeset patch
# User Chris Cannam
# Date 1233062710 0
# Node ID 4f4f943bfdfc911f339dcbdf6360fc18ef806fc0
# Parent  13e8edbffbd7ba281058c1edf24b71923f2aa788
* Merge from one-fftdataserver-per-fftmodel branch.  This bit of
reworking (which is not described very accurately by the title of
the branch) turns the MatrixFile object into something that either
reads or writes, but not both, and separates the FFT file cache
reader and writer implementations separately.  This allows the
FFT data server to have a single thread owning writers and one reader
per "customer" thread, and for all locking to be vastly simplified
and concentrated in the data server alone (because none of the
classes it makes use of is used in more than one thread at a time).
The result is faster and more trustworthy code.

diff -r 13e8edbffbd7 -r 4f4f943bfdfc layer/SpectrogramLayer.cpp
--- a/layer/SpectrogramLayer.cpp	Mon Jan 26 16:54:44 2009 +0000
+++ b/layer/SpectrogramLayer.cpp	Tue Jan 27 13:25:10 2009 +0000
@@ -2215,12 +2215,12 @@
                     break;
                 }
             }
-            
+/*!!!            
             if (!fftSuspended) {
                 fft->suspendWrites();
                 fftSuspended = true;
             }
-
+*/
             Profiler innerprof2("SpectrogramLayer::paint: 1 data column");
 
             MagnitudeRange mag;
@@ -2487,7 +2487,7 @@
         m_lastPaintTime = RealTime::fromTimeval(tv) - mainPaintStart;
     }
 
-    if (fftSuspended) fft->resume();
+//!!!    if (fftSuspended) fft->resume();
 }
 
 void