changeset 1365:3382d914e110

Merge from branch 3.0-integration
author Chris Cannam
date Fri, 13 Jan 2017 10:29:44 +0000
parents 6a7ea3bd0e10 (diff) b812df0351d9 (current diff)
children bbc4e4ee15d5
files base/RealTime.cpp base/Resampler.cpp base/Resampler.h base/ResizeableBitset.h base/test/TestRealTime.h base/test/main.cpp base/test/test.pro data/fft/FFTCacheReader.h data/fft/FFTCacheStorageType.h data/fft/FFTCacheWriter.h data/fft/FFTDataServer.cpp data/fft/FFTDataServer.h data/fft/FFTFileCacheReader.cpp data/fft/FFTFileCacheReader.h data/fft/FFTFileCacheWriter.cpp data/fft/FFTFileCacheWriter.h data/fft/FFTMemoryCache.cpp data/fft/FFTMemoryCache.h data/fft/FFTapi.cpp data/fft/FFTapi.h data/fileio/MatrixFile.cpp data/fileio/MatrixFile.h data/fileio/QuickTimeFileReader.cpp data/fileio/QuickTimeFileReader.h data/fileio/test/main.cpp data/fileio/test/test.pro data/fileio/test/testfiles/12000-6-16.aiff data/fileio/test/testfiles/32000-1-16.wav data/fileio/test/testfiles/32000-1.m4a data/fileio/test/testfiles/32000-1.mp3 data/fileio/test/testfiles/32000-1.ogg data/fileio/test/testfiles/44100-1-32.wav data/fileio/test/testfiles/44100-2-16.wav data/fileio/test/testfiles/44100-2-8.wav data/fileio/test/testfiles/44100-2.flac data/fileio/test/testfiles/44100-2.m4a data/fileio/test/testfiles/44100-2.mp3 data/fileio/test/testfiles/44100-2.ogg data/fileio/test/testfiles/48000-1-16.wav data/fileio/test/testfiles/48000-1-24.aiff data/fileio/test/testfiles/8000-1-8.wav data/fileio/test/testfiles/8000-2-16.wav data/fileio/test/testfiles/8000-6-16.wav data/model/test/main.cpp data/model/test/test.pro
diffstat 0 files changed, 0 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff