changeset 88:6b864e6864cb

* Introduce simple non-RT thread base class * Rename MatrixFileCache to MatrixFile * some fixes & tidying
author Chris Cannam
date Thu, 04 May 2006 16:03:02 +0000
parents 4b98bda7e94d
children 803830f186ef
files layer/SpectrogramLayer.cpp layer/SpectrogramLayer.h
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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();
--- 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) :