comparison svcore.pro @ 1124:efea94b04d5a 3.0-integration

Merge from branch recording
author Chris Cannam
date Thu, 20 Aug 2015 13:15:19 +0100
parents 329ddaf7415d b9faee02afa5
children 2c43f9904068
comparison
equal deleted inserted replaced
1118:fbc43d5dc3d1 1124:efea94b04d5a
172 data/model/SparseTimeValueModel.h \ 172 data/model/SparseTimeValueModel.h \
173 data/model/SparseValueModel.h \ 173 data/model/SparseValueModel.h \
174 data/model/TabularModel.h \ 174 data/model/TabularModel.h \
175 data/model/TextModel.h \ 175 data/model/TextModel.h \
176 data/model/WaveFileModel.h \ 176 data/model/WaveFileModel.h \
177 data/model/ReadOnlyWaveFileModel.h \
177 data/model/WritableWaveFileModel.h \ 178 data/model/WritableWaveFileModel.h \
178 data/osc/OSCMessage.h \ 179 data/osc/OSCMessage.h \
179 data/osc/OSCQueue.h 180 data/osc/OSCQueue.h
180 SOURCES += data/fft/FFTapi.cpp \ 181 SOURCES += data/fft/FFTapi.cpp \
181 data/fileio/AudioFileReader.cpp \ 182 data/fileio/AudioFileReader.cpp \
213 data/model/ModelDataTableModel.cpp \ 214 data/model/ModelDataTableModel.cpp \
214 data/model/PowerOfSqrtTwoZoomConstraint.cpp \ 215 data/model/PowerOfSqrtTwoZoomConstraint.cpp \
215 data/model/PowerOfTwoZoomConstraint.cpp \ 216 data/model/PowerOfTwoZoomConstraint.cpp \
216 data/model/RangeSummarisableTimeValueModel.cpp \ 217 data/model/RangeSummarisableTimeValueModel.cpp \
217 data/model/WaveFileModel.cpp \ 218 data/model/WaveFileModel.cpp \
219 data/model/ReadOnlyWaveFileModel.cpp \
218 data/model/WritableWaveFileModel.cpp \ 220 data/model/WritableWaveFileModel.cpp \
219 data/osc/OSCMessage.cpp \ 221 data/osc/OSCMessage.cpp \
220 data/osc/OSCQueue.cpp 222 data/osc/OSCQueue.cpp
221 223
222 HEADERS += plugin/DSSIPluginFactory.h \ 224 HEADERS += plugin/DSSIPluginFactory.h \