Mercurial > hg > sonic-visualiser
changeset 1349:59c89f0b2a3b bqfft
Branch to use bqfft code and remove FFTapi
| author | Chris Cannam |
|---|---|
| date | Mon, 21 Nov 2016 15:05:57 +0000 |
| parents | 750577301795 |
| children | 83c21fa74e03 |
| files | .hgsub .hgsubstate base.pri bq-files.pri bq.pro |
| diffstat | 5 files changed, 7 insertions(+), 108 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsub Fri Nov 18 23:30:37 2016 +0000 +++ b/.hgsub Mon Nov 21 15:05:57 2016 +0000 @@ -4,6 +4,7 @@ svapp = https://code.soundsoftware.ac.uk/hg/svapp dataquay = https://bitbucket.org/breakfastquay/dataquay bqvec = https://bitbucket.org/breakfastquay/bqvec +bqfft = https://bitbucket.org/breakfastquay/bqfft bqresample = https://bitbucket.org/breakfastquay/bqresample bqaudioio = https://bitbucket.org/breakfastquay/bqaudioio sv-dependency-builds = https://code.soundsoftware.ac.uk/hg/sv-dependency-builds
--- a/.hgsubstate Fri Nov 18 23:30:37 2016 +0000 +++ b/.hgsubstate Mon Nov 21 15:05:57 2016 +0000 @@ -1,4 +1,5 @@ fd86e70e00ae923479609a7e53d6481c09a76791 bqaudioio +44865d17ef69a891af778e7b9a4c82e790775c45 bqfft 6b0cbfca8fb7cf64f89b0a0026b63bc212b156af bqresample 68f8e88d6d76fc4ca074166cb80979ccbfc2b6c9 bqvec 1eefc20919cd080b684b2bbbc0af7270b8facb54 checker @@ -7,6 +8,6 @@ 3257ddb6fff110cc88f3ffeaeefa0f29d5eb3b6f piper-cpp e1712f7d74a455337591091a57beba2f0443b9dd sv-dependency-builds 36aa947ec9629108da8abe39b37fb97c1e989514 svapp -f50c0bbe90960b87f6ab3fd1661f5a9fb04c877a svcore -236ecb2c07584a873b47049f42fa0b2668115edb svgui +bac86d3fc6c95e4af0ef95b664538f2517b46861 svcore +6796afa25c8847470e6c4634d4a38f974781b440 svgui 0eebd22a081a824067bf3d5de65326696feab653 vamp-plugin-sdk
--- a/base.pri Fri Nov 18 23:30:37 2016 +0000 +++ b/base.pri Mon Nov 21 15:05:57 2016 +0000 @@ -3,6 +3,7 @@ . \ bqvec \ bqvec/bqvec \ + bqfft \ bqresample \ bqaudioio \ bqaudioio/bqaudioio \
--- a/bq-files.pri Fri Nov 18 23:30:37 2016 +0000 +++ b/bq-files.pri Mon Nov 21 15:05:57 2016 +0000 @@ -9,6 +9,7 @@ bqvec/bqvec/VectorOps.h \ bqvec/pommier/neon_mathfun.h \ bqvec/pommier/sse_mathfun.h \ + bqfft/bqfft/FFT.h \ bqresample/bqresample/Resampler.h \ bqresample/speex/speex_resampler.h \ bqaudioio/bqaudioio/ApplicationPlaybackSource.h \ @@ -31,6 +32,7 @@ bqvec/src/Allocators.cpp \ bqvec/src/Barrier.cpp \ bqvec/src/VectorOpsComplex.cpp \ + bqfft/src/FFT.cpp \ bqresample/src/Resampler.cpp \ bqaudioio/src/AudioFactory.cpp \ bqaudioio/src/JACKAudioIO.cpp \
--- a/bq.pro Fri Nov 18 23:30:37 2016 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,106 +0,0 @@ - -TEMPLATE = lib - -win32-g++ { - INCLUDEPATH += sv-dependency-builds/win32-mingw/include - LIBS += -Lsv-dependency-builds/win32-mingw/lib -} -win32-msvc* { - # We actually expect MSVC to be used only for 64-bit builds, - # though the qmake spec is still called win32-msvc* - INCLUDEPATH += sv-dependency-builds/win64-msvc/include - LIBS += -Lrelease -Lsv-dependency-builds/win64-msvc/lib -} -mac* { - INCLUDEPATH += sv-dependency-builds/osx/include - LIBS += -Lsv-dependency-builds/osx/lib -} - -exists(config.pri) { - include(config.pri) -} - -!exists(config.pri) { - - CONFIG += release - DEFINES += NDEBUG BUILD_RELEASE NO_TIMING - - linux* { - DEFINES += HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_LIBSAMPLERATE HAVE_MAD HAVE_ID3TAG HAVE_PORTAUDIO - LIBS += -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -lz - } - - win32-g++ { - DEFINES += HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_LIBSAMPLERATE HAVE_MAD HAVE_ID3TAG HAVE_PORTAUDIO - LIBS += -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -lz - DEFINES += USE_OWN_ALIGNED_MALLOC _USE_MATH_DEFINES - LIBS += -lwinmm -lws2_32 - } - win32-msvc* { - DEFINES += HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_LIBSAMPLERATE HAVE_MAD HAVE_ID3TAG HAVE_PORTAUDIO - LIBS += -lfftw3 -lfftw3f -lportaudio - DEFINES += USE_OWN_ALIGNED_MALLOC _USE_MATH_DEFINES - LIBS += -lwinmm -lws2_32 - } - - macx* { - DEFINES += HAVE_COREAUDIO MALLOC_IS_ALIGNED - LIBS += -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate - } -} - -CONFIG += staticlib warn_on stl exceptions c++11 -CONFIG -= qt - -TARGET = bq - -DEPENDPATH += bqvec bqresample bqaudioio bqvec/bqvec bqresample/bqresample bqaudioio/bqaudioio -INCLUDEPATH += bqvec bqresample bqaudioio bqvec/bqvec bqresample/bqresample bqaudioio/bqaudioio - -OBJECTS_DIR = o - -HEADERS += \ - bqvec/bqvec/Allocators.h \ - bqvec/bqvec/Barrier.h \ - bqvec/bqvec/ComplexTypes.h \ - bqvec/bqvec/Restrict.h \ - bqvec/bqvec/RingBuffer.h \ - bqvec/bqvec/VectorOpsComplex.h \ - bqvec/bqvec/VectorOps.h \ - bqvec/pommier/neon_mathfun.h \ - bqvec/pommier/sse_mathfun.h \ - bqresample/bqresample/Resampler.h \ - bqresample/speex/speex_resampler.h \ - bqaudioio/bqaudioio/ApplicationPlaybackSource.h \ - bqaudioio/bqaudioio/ApplicationRecordTarget.h \ - bqaudioio/bqaudioio/AudioFactory.h \ - bqaudioio/bqaudioio/SystemAudioIO.h \ - bqaudioio/bqaudioio/SystemPlaybackTarget.h \ - bqaudioio/bqaudioio/SystemRecordSource.h \ - bqaudioio/src/DynamicJACK.h \ - bqaudioio/src/JACKAudioIO.h \ - bqaudioio/src/JACKPlaybackTarget.h \ - bqaudioio/src/JACKRecordSource.h \ - bqaudioio/src/PortAudioIO.h \ - bqaudioio/src/PortAudioPlaybackTarget.h \ - bqaudioio/src/PortAudioRecordSource.h \ - bqaudioio/src/PulseAudioIO.h \ - bqaudioio/src/PulseAudioPlaybackTarget.h - -SOURCES += \ - bqvec/src/Allocators.cpp \ - bqvec/src/Barrier.cpp \ - bqvec/src/VectorOpsComplex.cpp \ - bqresample/src/Resampler.cpp \ - bqaudioio/src/AudioFactory.cpp \ - bqaudioio/src/JACKAudioIO.cpp \ - bqaudioio/src/JACKPlaybackTarget.cpp \ - bqaudioio/src/JACKRecordSource.cpp \ - bqaudioio/src/PortAudioIO.cpp \ - bqaudioio/src/PortAudioPlaybackTarget.cpp \ - bqaudioio/src/PortAudioRecordSource.cpp \ - bqaudioio/src/PulseAudioIO.cpp \ - bqaudioio/src/PulseAudioPlaybackTarget.cpp \ - bqaudioio/src/SystemPlaybackTarget.cpp \ - bqaudioio/src/SystemRecordSource.cpp -