comparison svcore.pro @ 1105:a27b1ce86e4f 3.0-integration

Merge from branch simple-fft-model
author Chris Cannam
date Fri, 26 Jun 2015 14:07:25 +0100
parents 329ddaf7415d
children efea94b04d5a
comparison
equal deleted inserted replaced
1088:5fab8e4f5f19 1105:a27b1ce86e4f
117 base/UnitDatabase.cpp \ 117 base/UnitDatabase.cpp \
118 base/ViewManagerBase.cpp \ 118 base/ViewManagerBase.cpp \
119 base/XmlExportable.cpp 119 base/XmlExportable.cpp
120 120
121 HEADERS += data/fft/FFTapi.h \ 121 HEADERS += data/fft/FFTapi.h \
122 data/fft/FFTCacheReader.h \
123 data/fft/FFTCacheStorageType.h \
124 data/fft/FFTCacheWriter.h \
125 data/fft/FFTDataServer.h \
126 data/fft/FFTFileCacheReader.h \
127 data/fft/FFTFileCacheWriter.h \
128 data/fft/FFTMemoryCache.h \
129 data/fileio/AudioFileReader.h \ 122 data/fileio/AudioFileReader.h \
130 data/fileio/AudioFileReaderFactory.h \ 123 data/fileio/AudioFileReaderFactory.h \
124 data/fileio/AudioFileSizeEstimator.h \
131 data/fileio/BZipFileDevice.h \ 125 data/fileio/BZipFileDevice.h \
132 data/fileio/CachedFile.h \ 126 data/fileio/CachedFile.h \
133 data/fileio/CodedAudioFileReader.h \ 127 data/fileio/CodedAudioFileReader.h \
134 data/fileio/CSVFileReader.h \ 128 data/fileio/CSVFileReader.h \
135 data/fileio/CSVFileWriter.h \ 129 data/fileio/CSVFileWriter.h \
182 data/model/WaveFileModel.h \ 176 data/model/WaveFileModel.h \
183 data/model/WritableWaveFileModel.h \ 177 data/model/WritableWaveFileModel.h \
184 data/osc/OSCMessage.h \ 178 data/osc/OSCMessage.h \
185 data/osc/OSCQueue.h 179 data/osc/OSCQueue.h
186 SOURCES += data/fft/FFTapi.cpp \ 180 SOURCES += data/fft/FFTapi.cpp \
187 data/fft/FFTDataServer.cpp \
188 data/fft/FFTFileCacheReader.cpp \
189 data/fft/FFTFileCacheWriter.cpp \
190 data/fft/FFTMemoryCache.cpp \
191 data/fileio/AudioFileReader.cpp \ 181 data/fileio/AudioFileReader.cpp \
192 data/fileio/AudioFileReaderFactory.cpp \ 182 data/fileio/AudioFileReaderFactory.cpp \
183 data/fileio/AudioFileSizeEstimator.cpp \
193 data/fileio/BZipFileDevice.cpp \ 184 data/fileio/BZipFileDevice.cpp \
194 data/fileio/CachedFile.cpp \ 185 data/fileio/CachedFile.cpp \
195 data/fileio/CodedAudioFileReader.cpp \ 186 data/fileio/CodedAudioFileReader.cpp \
196 data/fileio/CSVFileReader.cpp \ 187 data/fileio/CSVFileReader.cpp \
197 data/fileio/CSVFileWriter.cpp \ 188 data/fileio/CSVFileWriter.cpp \