# HG changeset patch
# User Chris Cannam
# Date 1146758582 0
# Node ID 6b864e6864cb2925951be6847b85541aa1f2a6b6
# Parent  4b98bda7e94dc584f5beb7ba93667f6c2e267a21
* Introduce simple non-RT thread base class
* Rename MatrixFileCache to MatrixFile
* some fixes & tidying

diff -r 4b98bda7e94d -r 6b864e6864cb layer/SpectrogramLayer.cpp
--- a/layer/SpectrogramLayer.cpp	Wed May 03 16:48:03 2006 +0000
+++ b/layer/SpectrogramLayer.cpp	Thu May 04 16:03:02 2006 +0000
@@ -1304,13 +1304,13 @@
             if (!m_layer.m_writeCache) {
                 m_layer.m_writeCache = new FFTFileCache
                     (QString("%1").arg(getObjectExportId(&m_layer)),
-                     MatrixFileCache::ReadWrite);
+                     MatrixFile::ReadWrite);
             }
 	    m_layer.m_writeCache->resize(width, height);
             if (m_layer.m_cache) delete m_layer.m_cache;
             m_layer.m_cache = new FFTFileCache
                 (QString("%1").arg(getObjectExportId(&m_layer)),
-                 MatrixFileCache::ReadOnly);
+                 MatrixFile::ReadOnly);
 
 	    m_layer.setCacheColourmap();
 //!!!	    m_layer.m_writeCache->reset();
diff -r 4b98bda7e94d -r 6b864e6864cb layer/SpectrogramLayer.h
--- a/layer/SpectrogramLayer.h	Wed May 03 16:48:03 2006 +0000
+++ b/layer/SpectrogramLayer.h	Thu May 04 16:03:02 2006 +0000
@@ -19,10 +19,10 @@
 #include "base/Layer.h"
 #include "base/Window.h"
 #include "base/RealTime.h"
+#include "base/NonRTThread.h"
 #include "model/PowerOfSqrtTwoZoomConstraint.h"
 #include "model/DenseTimeValueModel.h"
 
-#include <QThread>
 #include <QMutex>
 #include <QWaitCondition>
 
@@ -240,7 +240,7 @@
     FFTCacheBase *m_writeCache;
     bool m_cacheInvalid;
 
-    class CacheFillThread : public QThread
+    class CacheFillThread : public NonRTThread
     {
     public:
 	CacheFillThread(SpectrogramLayer &layer) :