comparison data/data.pro @ 537:3cc4b7cd2aa5

* 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 63b8ba45d953
children c603d9439b37
comparison
equal deleted inserted replaced
536:beb51f558e9c 537:3cc4b7cd2aa5
14 OBJECTS_DIR = tmp_obj 14 OBJECTS_DIR = tmp_obj
15 MOC_DIR = tmp_moc 15 MOC_DIR = tmp_moc
16 16
17 # Input 17 # Input
18 HEADERS += fft/FFTapi.h \ 18 HEADERS += fft/FFTapi.h \
19 fft/FFTCache.h \ 19 fft/FFTCacheReader.h \
20 fft/FFTCacheStorageType.h \
21 fft/FFTCacheWriter.h \
20 fft/FFTDataServer.h \ 22 fft/FFTDataServer.h \
21 fft/FFTFileCache.h \ 23 fft/FFTFileCacheReader.h \
24 fft/FFTFileCacheWriter.h \
22 fft/FFTMemoryCache.h \ 25 fft/FFTMemoryCache.h \
23 fileio/AudioFileReader.h \ 26 fileio/AudioFileReader.h \
24 fileio/AudioFileReaderFactory.h \ 27 fileio/AudioFileReaderFactory.h \
25 fileio/BZipFileDevice.h \ 28 fileio/BZipFileDevice.h \
26 fileio/CachedFile.h \ 29 fileio/CachedFile.h \
71 model/WritableWaveFileModel.h \ 74 model/WritableWaveFileModel.h \
72 osc/OSCMessage.h \ 75 osc/OSCMessage.h \
73 osc/OSCQueue.h 76 osc/OSCQueue.h
74 SOURCES += fft/FFTapi.cpp \ 77 SOURCES += fft/FFTapi.cpp \
75 fft/FFTDataServer.cpp \ 78 fft/FFTDataServer.cpp \
76 fft/FFTFileCache.cpp \ 79 fft/FFTFileCacheReader.cpp \
80 fft/FFTFileCacheWriter.cpp \
77 fft/FFTMemoryCache.cpp \ 81 fft/FFTMemoryCache.cpp \
78 fileio/AudioFileReader.cpp \ 82 fileio/AudioFileReader.cpp \
79 fileio/AudioFileReaderFactory.cpp \ 83 fileio/AudioFileReaderFactory.cpp \
80 fileio/BZipFileDevice.cpp \ 84 fileio/BZipFileDevice.cpp \
81 fileio/CachedFile.cpp \ 85 fileio/CachedFile.cpp \