# HG changeset patch
# User Chris Cannam
# Date 1154536937 0
# Node ID 8d92611901d30a9e0c2a1ab72a18cda5ecca06e2
# Parent  21792a550ec982d3b5977197dec26aa3d628ead6
...

diff -r 21792a550ec9 -r 8d92611901d3 data/fft/FFTDataServer.cpp
--- a/data/fft/FFTDataServer.cpp	Mon Jul 31 17:05:18 2006 +0000
+++ b/data/fft/FFTDataServer.cpp	Wed Aug 02 16:42:17 2006 +0000
@@ -21,11 +21,13 @@
 
 #include "system/System.h"
 
-//#define DEBUG_FFT_SERVER 1
-//#define DEBUG_FFT_SERVER_FILL 1
+#define DEBUG_FFT_SERVER 1
+#define DEBUG_FFT_SERVER_FILL 1
 
 #ifdef DEBUG_FFT_SERVER_FILL
-#define DEBUG_FFT_SERVER
+#ifndef DEBUG_FFT_SERVER
+#define DEBUG_FFT_SERVER 1
+#endif
 #endif
 
 FFTDataServer::ServerMap FFTDataServer::m_servers;
@@ -310,6 +312,7 @@
     m_lastUsedCache(-1),
     m_fftInput(0),
     m_exiting(false),
+    m_suspended(true), //!!! or false?
     m_fillThread(0)
 {
     size_t start = m_model->getStartFrame();
diff -r 21792a550ec9 -r 8d92611901d3 data/fileio/MatrixFile.cpp
--- a/data/fileio/MatrixFile.cpp	Mon Jul 31 17:05:18 2006 +0000
+++ b/data/fileio/MatrixFile.cpp	Wed Aug 02 16:42:17 2006 +0000
@@ -32,12 +32,14 @@
 #include <QFileInfo>
 #include <QDir>
 
-//#define DEBUG_MATRIX_FILE 1
-//#define DEBUG_MATRIX_FILE_READ_SET 1
+#define DEBUG_MATRIX_FILE 1
+#define DEBUG_MATRIX_FILE_READ_SET 1
 
 #ifdef DEBUG_MATRIX_FILE_READ_SET
+#ifndef DEBUG_MATRIX_FILE
 #define DEBUG_MATRIX_FILE 1
 #endif
+#endif
 
 std::map<QString, int> MatrixFile::m_refcount;
 QMutex MatrixFile::m_refcountMutex;