changeset 473:4f4f943bfdfc

* 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.
author Chris Cannam
date Tue, 27 Jan 2009 13:25:10 +0000
parents 13e8edbffbd7
children efc2bd6d3611
files layer/SpectrogramLayer.cpp
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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