From ca3edd45153e594f370ba1443c15c8e884e5bdcd Mon Sep 17 00:00:00 2001 From: Dave Griffiths Date: Sun, 4 Sep 2022 11:38:20 +0100 Subject: [PATCH] big directory re-org --- {samplebrain/qt => app}/MainWindow.cpp | 0 {samplebrain/qt => app}/MainWindow.h | 3 +- {samplebrain/qt => app}/audio_thread.cpp | 0 {samplebrain/qt => app}/audio_thread.h | 4 +- {samplebrain/qt => app}/feedback.cpp | 0 {samplebrain/qt => app}/feedback.h | 2 +- {samplebrain/qt => app}/generated/ui_sample.h | 0 .../qt => app}/generated/ui_samplebrain.h | 14 +- .../qt => app}/icon/samplebrain-icon.icns | Bin {samplebrain/qt => app}/images/at.jpg | Bin {samplebrain/qt => app}/images/at.png | Bin {samplebrain/qt => app}/images/pause.png | Bin {samplebrain/qt => app}/images/play.png | Bin {samplebrain/qt => app}/images/record.png | Bin {samplebrain/qt => app}/images/stop.png | Bin {samplebrain/qt => app}/notes.txt | 0 {samplebrain/qt => app}/process_thread.cpp | 0 {samplebrain/qt => app}/process_thread.h | 2 +- {samplebrain/qt => app}/qtmain.cpp | 0 app/samplebrain.pro | 50 ++++ {samplebrain/qt => app}/samplebrain.qrc | 0 {samplebrain/qt => app}/sound_items.cpp | 2 +- {samplebrain/qt => app}/sound_items.h | 0 {samplebrain => brain}/Makefile.in | 23 +- {samplebrain => brain}/configure | 246 +++++++++++------- {samplebrain => brain}/configure.ac | 1 + {samplebrain => brain}/dist.sh | 0 {samplebrain => brain}/interface/buttons.svg | 0 {samplebrain => brain}/interface/sample.ui | 0 .../interface/samplebrain.ui | 8 +- {samplebrain => brain}/replace.py | 0 .../src/aquila/Exceptions.h | 0 {samplebrain => brain}/src/aquila/aquila.h | 0 {samplebrain => brain}/src/aquila/filter.h | 0 .../src/aquila/filter/MelFilter.cpp | 0 .../src/aquila/filter/MelFilter.dep | 0 .../src/aquila/filter/MelFilter.h | 0 .../src/aquila/filter/MelFilterBank.cpp | 0 .../src/aquila/filter/MelFilterBank.dep | 0 .../src/aquila/filter/MelFilterBank.h | 0 {samplebrain => brain}/src/aquila/functions.h | 0 {samplebrain => brain}/src/aquila/global.h | 0 {samplebrain => brain}/src/aquila/ml.h | 0 {samplebrain => brain}/src/aquila/ml/Dtw.cpp | 0 {samplebrain => brain}/src/aquila/ml/Dtw.h | 0 .../src/aquila/ml/DtwPoint.h | 0 {samplebrain => brain}/src/aquila/source.h | 0 .../src/aquila/source/Frame.cpp | 0 .../src/aquila/source/Frame.h | 0 .../src/aquila/source/FramesCollection.cpp | 0 .../src/aquila/source/FramesCollection.h | 0 .../src/aquila/source/PlainTextFile.cpp | 0 .../src/aquila/source/PlainTextFile.h | 0 .../src/aquila/source/RawPcmFile.h | 0 .../src/aquila/source/SignalSource.cpp | 0 .../src/aquila/source/SignalSource.h | 0 .../src/aquila/source/WaveFile.cpp | 0 .../src/aquila/source/WaveFile.h | 0 .../src/aquila/source/WaveFileHandler.cpp | 0 .../src/aquila/source/WaveFileHandler.h | 0 .../src/aquila/source/generator/Generator.cpp | 0 .../src/aquila/source/generator/Generator.h | 0 .../source/generator/PinkNoiseGenerator.cpp | 0 .../source/generator/PinkNoiseGenerator.h | 0 .../aquila/source/generator/SineGenerator.cpp | 0 .../aquila/source/generator/SineGenerator.h | 0 .../source/generator/SquareGenerator.cpp | 0 .../aquila/source/generator/SquareGenerator.h | 0 .../source/generator/TriangleGenerator.cpp | 0 .../source/generator/TriangleGenerator.h | 0 .../source/generator/WhiteNoiseGenerator.cpp | 0 .../source/generator/WhiteNoiseGenerator.h | 0 .../aquila/source/window/BarlettWindow.cpp | 0 .../src/aquila/source/window/BarlettWindow.h | 0 .../aquila/source/window/BlackmanWindow.cpp | 0 .../src/aquila/source/window/BlackmanWindow.h | 0 .../aquila/source/window/FlattopWindow.cpp | 0 .../src/aquila/source/window/FlattopWindow.h | 0 .../aquila/source/window/GaussianWindow.cpp | 0 .../src/aquila/source/window/GaussianWindow.h | 0 .../aquila/source/window/HammingWindow.cpp | 0 .../src/aquila/source/window/HammingWindow.h | 0 .../src/aquila/source/window/HannWindow.cpp | 0 .../src/aquila/source/window/HannWindow.h | 0 .../aquila/source/window/RectangularWindow.h | 0 {samplebrain => brain}/src/aquila/synth.h | 0 .../aquila/synth/KarplusStrongSynthesizer.cpp | 0 .../aquila/synth/KarplusStrongSynthesizer.h | 0 .../src/aquila/synth/SineSynthesizer.cpp | 0 .../src/aquila/synth/SineSynthesizer.h | 0 .../src/aquila/synth/Synthesizer.cpp | 0 .../src/aquila/synth/Synthesizer.h | 0 {samplebrain => brain}/src/aquila/tools.h | 0 .../src/aquila/tools/TextPlot.cpp | 0 .../src/aquila/tools/TextPlot.h | 0 {samplebrain => brain}/src/aquila/transform.h | 0 .../src/aquila/transform/AquilaFft.cpp | 0 .../src/aquila/transform/AquilaFft.h | 0 .../src/aquila/transform/Dct.cpp | 0 .../src/aquila/transform/Dct.dep | 0 .../src/aquila/transform/Dct.h | 0 .../src/aquila/transform/Dft.cpp | 0 .../src/aquila/transform/Dft.dep | 0 .../src/aquila/transform/Dft.h | 0 .../src/aquila/transform/Fft.h | 0 .../src/aquila/transform/FftFactory.cpp | 0 .../src/aquila/transform/FftFactory.dep | 0 .../src/aquila/transform/FftFactory.h | 0 .../src/aquila/transform/Mfcc.cpp | 0 .../src/aquila/transform/Mfcc.h | 0 .../src/aquila/transform/OouraFft.cpp | 0 .../src/aquila/transform/OouraFft.dep | 0 .../src/aquila/transform/OouraFft.h | 0 .../src/aquila/transform/Spectrogram.cpp | 0 .../src/aquila/transform/Spectrogram.h | 0 .../aquila/wrappers/SoundBufferAdapter.cpp | 0 .../src/aquila/wrappers/SoundBufferAdapter.h | 0 {samplebrain => brain}/src/block.cpp | 0 {samplebrain => brain}/src/block.h | 6 +- {samplebrain => brain}/src/block_source.h | 0 {samplebrain => brain}/src/block_stream.cpp | 0 {samplebrain => brain}/src/block_stream.h | 2 +- {samplebrain => brain}/src/brain.cpp | 2 +- {samplebrain => brain}/src/brain.h | 4 +- {samplebrain => brain}/src/config.h.in | 0 {samplebrain => brain}/src/fft.cpp | 0 {samplebrain => brain}/src/fft.h | 2 +- {samplebrain => brain}/src/main.cpp | 2 +- {samplebrain => brain}/src/mfcc.cpp | 0 {samplebrain => brain}/src/mfcc.h | 2 +- {samplebrain => brain}/src/pitchshift.cpp | 0 {samplebrain => brain}/src/pitchshift.h | 4 +- {samplebrain => brain}/src/renderer.cpp | 0 {samplebrain => brain}/src/renderer.h | 2 +- {samplebrain => brain}/src/search_params.cpp | 0 {samplebrain => brain}/src/search_params.h | 4 +- .../src/spiralcore}/OSC_server.cpp | 0 .../src/spiralcore}/OSC_server.h | 0 .../src/spiralcore}/allocator.cpp | 0 .../src/spiralcore}/allocator.h | 0 .../src/spiralcore}/audio.cpp | 16 -- .../src/spiralcore}/audio.h | 0 .../src/spiralcore}/command_ring_buffer.cpp | 0 .../src/spiralcore}/command_ring_buffer.h | 0 .../src/spiralcore}/fixed.h | 0 .../src/spiralcore}/portaudio_client.cpp | 0 .../src/spiralcore}/portaudio_client.h | 0 .../src/spiralcore}/ring_buffer.cpp | 0 .../src/spiralcore}/ring_buffer.h | 0 .../src/spiralcore}/sample.cpp | 0 .../src/spiralcore}/sample.h | 0 .../src/spiralcore}/stream.cpp | 0 .../src/spiralcore}/stream.h | 0 .../src/spiralcore}/types.h | 0 {samplebrain => brain}/src/status.cpp | 0 {samplebrain => brain}/src/status.h | 0 {samplebrain => brain}/src/window.cpp | 0 {samplebrain => brain}/src/window.h | 4 +- {samplebrain => brain}/test_data/100f32.wav | Bin {samplebrain => brain}/test_data/100i16.wav | Bin {samplebrain => brain}/test_data/noise.wav | Bin {samplebrain => brain}/test_data/up.wav | Bin cooking/{mock => ideas}/colour.png | Bin cooking/{mock => ideas}/drawing.svg | 0 cooking/{mock => ideas}/drawing2.svg | 0 cooking/{mock => ideas}/monochrome.png | Bin cooking/{mock => ideas}/wav1.jpg | Bin cooking/{mock => ideas}/wav1.png | Bin cooking/{mock => ideas}/wav1.xcf | Bin cooking/{mock => ideas}/wav2.jpg | Bin cooking/{mock => ideas}/wav2.png | Bin cooking/{mock => ideas}/wav3.jpg | Bin cooking/{mock => ideas}/wav3.png | Bin cooking/{mock => ideas}/wav4.jpg | Bin cooking/{mock => ideas}/wav4.png | Bin cooking/{mock => ideas}/wav5.jpg | Bin cooking/{mock => ideas}/wav5.png | Bin cooking/{mock => ideas}/wav6.jpg | Bin cooking/{mock => ideas}/wav6.png | Bin cooking/{mock => ideas}/wav7.jpg | Bin cooking/{mock => ideas}/wav7.png | Bin cooking/{mock => ideas}/wav7.xcf | Bin cooking/{mock => ideas}/wav8.jpg | Bin cooking/{mock => ideas}/wav8.png | Bin cooking/{mock => ideas}/wav9.jpg | Bin cooking/{mock => ideas}/wav9.png | Bin {python => cooking/python}/_magicsquares.so | Bin .../python}/features/__init__.py | 0 .../python}/features/__init__.pyc | Bin {python => cooking/python}/features/base.py | 0 {python => cooking/python}/features/base.pyc | Bin .../python}/features/sigproc.py | 0 .../python}/features/sigproc.pyc | Bin {python => cooking/python}/magicsquares.py | 0 {python => cooking/python}/magicsquares.pyc | Bin {python => cooking/python}/samplebrain | 0 .../python}/transponge-eigen.py | 0 {python => cooking/python}/transponge-gui.py | 0 {python => cooking/python}/transponge-mfcc.py | 0 {python => cooking/python}/transponge.py | 0 {sponge => cooking/sponge}/.gitignore | 0 {sponge => cooking/sponge}/README | 0 {sponge => cooking/sponge}/images/icon.png | Bin .../comirva/0.0.36/comirva-0.0.36.jar.md5 | 0 .../comirva/0.0.36/comirva-0.0.36.jar.sha1 | 0 .../local/comirva/0.0.36/comirva-0.0.36.pom | 0 .../comirva/0.0.36/comirva-0.0.36.pom.md5 | 0 .../comirva/0.0.36/comirva-0.0.36.pom.sha1 | 0 .../local/comirva/0.36/comirva-0.36.jar.md5 | 0 .../local/comirva/0.36/comirva-0.36.jar.sha1 | 0 .../local/comirva/0.36/comirva-0.36.pom | 0 .../local/comirva/0.36/comirva-0.36.pom.md5 | 0 .../local/comirva/0.36/comirva-0.36.pom.sha1 | 0 .../local/comirva/maven-metadata-local.xml | 0 .../comirva/maven-metadata-local.xml.md5 | 0 .../comirva/maven-metadata-local.xml.sha1 | 0 {sponge => cooking/sponge}/project.clj | 0 .../sponge}/src/app/aggregate.clj | 0 {sponge => cooking/sponge}/src/app/block.clj | 0 .../sponge}/src/app/blocklist.clj | 0 {sponge => cooking/sponge}/src/app/core.clj | 0 {sponge => cooking/sponge}/src/app/listen.clj | 0 {sponge => cooking/sponge}/src/app/wav.clj | 0 .../sponge}/test/app/test/aggregate.clj | 0 .../sponge}/test/app/test/block.clj | 0 .../sponge}/test/app/test/blocklist.clj | 0 .../sponge}/test/app/test/core.clj | 0 .../sponge}/test/app/test/listen.clj | 0 test.cpp => cooking/test.cpp | 0 samplebrain/qt/samplebrain.pro | 50 ---- transponge-mfcc.py | 130 --------- 231 files changed, 253 insertions(+), 332 deletions(-) rename {samplebrain/qt => app}/MainWindow.cpp (100%) rename {samplebrain/qt => app}/MainWindow.h (99%) rename {samplebrain/qt => app}/audio_thread.cpp (100%) rename {samplebrain/qt => app}/audio_thread.h (95%) rename {samplebrain/qt => app}/feedback.cpp (100%) rename {samplebrain/qt => app}/feedback.h (96%) rename {samplebrain/qt => app}/generated/ui_sample.h (100%) rename {samplebrain/qt => app}/generated/ui_samplebrain.h (99%) rename {samplebrain/qt => app}/icon/samplebrain-icon.icns (100%) rename {samplebrain/qt => app}/images/at.jpg (100%) rename {samplebrain/qt => app}/images/at.png (100%) rename {samplebrain/qt => app}/images/pause.png (100%) rename {samplebrain/qt => app}/images/play.png (100%) rename {samplebrain/qt => app}/images/record.png (100%) rename {samplebrain/qt => app}/images/stop.png (100%) rename {samplebrain/qt => app}/notes.txt (100%) rename {samplebrain/qt => app}/process_thread.cpp (100%) rename {samplebrain/qt => app}/process_thread.h (98%) rename {samplebrain/qt => app}/qtmain.cpp (100%) create mode 100644 app/samplebrain.pro rename {samplebrain/qt => app}/samplebrain.qrc (100%) rename {samplebrain/qt => app}/sound_items.cpp (99%) rename {samplebrain/qt => app}/sound_items.h (100%) rename {samplebrain => brain}/Makefile.in (74%) rename {samplebrain => brain}/configure (96%) rename {samplebrain => brain}/configure.ac (92%) rename {samplebrain => brain}/dist.sh (100%) rename {samplebrain => brain}/interface/buttons.svg (100%) rename {samplebrain => brain}/interface/sample.ui (100%) rename {samplebrain => brain}/interface/samplebrain.ui (99%) rename {samplebrain => brain}/replace.py (100%) rename {samplebrain => brain}/src/aquila/Exceptions.h (100%) rename {samplebrain => brain}/src/aquila/aquila.h (100%) rename {samplebrain => brain}/src/aquila/filter.h (100%) rename {samplebrain => brain}/src/aquila/filter/MelFilter.cpp (100%) rename {samplebrain => brain}/src/aquila/filter/MelFilter.dep (100%) rename {samplebrain => brain}/src/aquila/filter/MelFilter.h (100%) rename {samplebrain => brain}/src/aquila/filter/MelFilterBank.cpp (100%) rename {samplebrain => brain}/src/aquila/filter/MelFilterBank.dep (100%) rename {samplebrain => brain}/src/aquila/filter/MelFilterBank.h (100%) rename {samplebrain => brain}/src/aquila/functions.h (100%) rename {samplebrain => brain}/src/aquila/global.h (100%) rename {samplebrain => brain}/src/aquila/ml.h (100%) rename {samplebrain => brain}/src/aquila/ml/Dtw.cpp (100%) rename {samplebrain => brain}/src/aquila/ml/Dtw.h (100%) rename {samplebrain => brain}/src/aquila/ml/DtwPoint.h (100%) rename {samplebrain => brain}/src/aquila/source.h (100%) rename {samplebrain => brain}/src/aquila/source/Frame.cpp (100%) rename {samplebrain => brain}/src/aquila/source/Frame.h (100%) rename {samplebrain => brain}/src/aquila/source/FramesCollection.cpp (100%) rename {samplebrain => brain}/src/aquila/source/FramesCollection.h (100%) rename {samplebrain => brain}/src/aquila/source/PlainTextFile.cpp (100%) rename {samplebrain => brain}/src/aquila/source/PlainTextFile.h (100%) rename {samplebrain => brain}/src/aquila/source/RawPcmFile.h (100%) rename {samplebrain => brain}/src/aquila/source/SignalSource.cpp (100%) rename {samplebrain => brain}/src/aquila/source/SignalSource.h (100%) rename {samplebrain => brain}/src/aquila/source/WaveFile.cpp (100%) rename {samplebrain => brain}/src/aquila/source/WaveFile.h (100%) rename {samplebrain => brain}/src/aquila/source/WaveFileHandler.cpp (100%) rename {samplebrain => brain}/src/aquila/source/WaveFileHandler.h (100%) rename {samplebrain => brain}/src/aquila/source/generator/Generator.cpp (100%) rename {samplebrain => brain}/src/aquila/source/generator/Generator.h (100%) rename {samplebrain => brain}/src/aquila/source/generator/PinkNoiseGenerator.cpp (100%) rename {samplebrain => brain}/src/aquila/source/generator/PinkNoiseGenerator.h (100%) rename {samplebrain => brain}/src/aquila/source/generator/SineGenerator.cpp (100%) rename {samplebrain => brain}/src/aquila/source/generator/SineGenerator.h (100%) rename {samplebrain => brain}/src/aquila/source/generator/SquareGenerator.cpp (100%) rename {samplebrain => brain}/src/aquila/source/generator/SquareGenerator.h (100%) rename {samplebrain => brain}/src/aquila/source/generator/TriangleGenerator.cpp (100%) rename {samplebrain => brain}/src/aquila/source/generator/TriangleGenerator.h (100%) rename {samplebrain => brain}/src/aquila/source/generator/WhiteNoiseGenerator.cpp (100%) rename {samplebrain => brain}/src/aquila/source/generator/WhiteNoiseGenerator.h (100%) rename {samplebrain => brain}/src/aquila/source/window/BarlettWindow.cpp (100%) rename {samplebrain => brain}/src/aquila/source/window/BarlettWindow.h (100%) rename {samplebrain => brain}/src/aquila/source/window/BlackmanWindow.cpp (100%) rename {samplebrain => brain}/src/aquila/source/window/BlackmanWindow.h (100%) rename {samplebrain => brain}/src/aquila/source/window/FlattopWindow.cpp (100%) rename {samplebrain => brain}/src/aquila/source/window/FlattopWindow.h (100%) rename {samplebrain => brain}/src/aquila/source/window/GaussianWindow.cpp (100%) rename {samplebrain => brain}/src/aquila/source/window/GaussianWindow.h (100%) rename {samplebrain => brain}/src/aquila/source/window/HammingWindow.cpp (100%) rename {samplebrain => brain}/src/aquila/source/window/HammingWindow.h (100%) rename {samplebrain => brain}/src/aquila/source/window/HannWindow.cpp (100%) rename {samplebrain => brain}/src/aquila/source/window/HannWindow.h (100%) rename {samplebrain => brain}/src/aquila/source/window/RectangularWindow.h (100%) rename {samplebrain => brain}/src/aquila/synth.h (100%) rename {samplebrain => brain}/src/aquila/synth/KarplusStrongSynthesizer.cpp (100%) rename {samplebrain => brain}/src/aquila/synth/KarplusStrongSynthesizer.h (100%) rename {samplebrain => brain}/src/aquila/synth/SineSynthesizer.cpp (100%) rename {samplebrain => brain}/src/aquila/synth/SineSynthesizer.h (100%) rename {samplebrain => brain}/src/aquila/synth/Synthesizer.cpp (100%) rename {samplebrain => brain}/src/aquila/synth/Synthesizer.h (100%) rename {samplebrain => brain}/src/aquila/tools.h (100%) rename {samplebrain => brain}/src/aquila/tools/TextPlot.cpp (100%) rename {samplebrain => brain}/src/aquila/tools/TextPlot.h (100%) rename {samplebrain => brain}/src/aquila/transform.h (100%) rename {samplebrain => brain}/src/aquila/transform/AquilaFft.cpp (100%) rename {samplebrain => brain}/src/aquila/transform/AquilaFft.h (100%) rename {samplebrain => brain}/src/aquila/transform/Dct.cpp (100%) rename {samplebrain => brain}/src/aquila/transform/Dct.dep (100%) rename {samplebrain => brain}/src/aquila/transform/Dct.h (100%) rename {samplebrain => brain}/src/aquila/transform/Dft.cpp (100%) rename {samplebrain => brain}/src/aquila/transform/Dft.dep (100%) rename {samplebrain => brain}/src/aquila/transform/Dft.h (100%) rename {samplebrain => brain}/src/aquila/transform/Fft.h (100%) rename {samplebrain => brain}/src/aquila/transform/FftFactory.cpp (100%) rename {samplebrain => brain}/src/aquila/transform/FftFactory.dep (100%) rename {samplebrain => brain}/src/aquila/transform/FftFactory.h (100%) rename {samplebrain => brain}/src/aquila/transform/Mfcc.cpp (100%) rename {samplebrain => brain}/src/aquila/transform/Mfcc.h (100%) rename {samplebrain => brain}/src/aquila/transform/OouraFft.cpp (100%) rename {samplebrain => brain}/src/aquila/transform/OouraFft.dep (100%) rename {samplebrain => brain}/src/aquila/transform/OouraFft.h (100%) rename {samplebrain => brain}/src/aquila/transform/Spectrogram.cpp (100%) rename {samplebrain => brain}/src/aquila/transform/Spectrogram.h (100%) rename {samplebrain => brain}/src/aquila/wrappers/SoundBufferAdapter.cpp (100%) rename {samplebrain => brain}/src/aquila/wrappers/SoundBufferAdapter.h (100%) rename {samplebrain => brain}/src/block.cpp (100%) rename {samplebrain => brain}/src/block.h (96%) rename {samplebrain => brain}/src/block_source.h (100%) rename {samplebrain => brain}/src/block_stream.cpp (100%) rename {samplebrain => brain}/src/block_stream.h (98%) rename {samplebrain => brain}/src/brain.cpp (99%) rename {samplebrain => brain}/src/brain.h (98%) rename {samplebrain => brain}/src/config.h.in (100%) rename {samplebrain => brain}/src/fft.cpp (100%) rename {samplebrain => brain}/src/fft.h (97%) rename {samplebrain => brain}/src/main.cpp (99%) rename {samplebrain => brain}/src/mfcc.cpp (100%) rename {samplebrain => brain}/src/mfcc.h (98%) rename {samplebrain => brain}/src/pitchshift.cpp (100%) rename {samplebrain => brain}/src/pitchshift.h (93%) rename {samplebrain => brain}/src/renderer.cpp (100%) rename {samplebrain => brain}/src/renderer.h (99%) rename {samplebrain => brain}/src/search_params.cpp (100%) rename {samplebrain => brain}/src/search_params.h (95%) rename {samplebrain/src/jellyfish => brain/src/spiralcore}/OSC_server.cpp (100%) rename {samplebrain/src/jellyfish => brain/src/spiralcore}/OSC_server.h (100%) rename {samplebrain/src/jellyfish => brain/src/spiralcore}/allocator.cpp (100%) rename {samplebrain/src/jellyfish => brain/src/spiralcore}/allocator.h (100%) rename {samplebrain/src/jellyfish => brain/src/spiralcore}/audio.cpp (87%) rename {samplebrain/src/jellyfish => brain/src/spiralcore}/audio.h (100%) rename {samplebrain/src/jellyfish => brain/src/spiralcore}/command_ring_buffer.cpp (100%) rename {samplebrain/src/jellyfish => brain/src/spiralcore}/command_ring_buffer.h (100%) rename {samplebrain/src/jellyfish => brain/src/spiralcore}/fixed.h (100%) rename {samplebrain/src/jellyfish => brain/src/spiralcore}/portaudio_client.cpp (100%) rename {samplebrain/src/jellyfish => brain/src/spiralcore}/portaudio_client.h (100%) rename {samplebrain/src/jellyfish => brain/src/spiralcore}/ring_buffer.cpp (100%) rename {samplebrain/src/jellyfish => brain/src/spiralcore}/ring_buffer.h (100%) rename {samplebrain/src/jellyfish => brain/src/spiralcore}/sample.cpp (100%) rename {samplebrain/src/jellyfish => brain/src/spiralcore}/sample.h (100%) rename {samplebrain/src/jellyfish => brain/src/spiralcore}/stream.cpp (100%) rename {samplebrain/src/jellyfish => brain/src/spiralcore}/stream.h (100%) rename {samplebrain/src/jellyfish => brain/src/spiralcore}/types.h (100%) rename {samplebrain => brain}/src/status.cpp (100%) rename {samplebrain => brain}/src/status.h (100%) rename {samplebrain => brain}/src/window.cpp (100%) rename {samplebrain => brain}/src/window.h (95%) rename {samplebrain => brain}/test_data/100f32.wav (100%) rename {samplebrain => brain}/test_data/100i16.wav (100%) rename {samplebrain => brain}/test_data/noise.wav (100%) rename {samplebrain => brain}/test_data/up.wav (100%) rename cooking/{mock => ideas}/colour.png (100%) rename cooking/{mock => ideas}/drawing.svg (100%) rename cooking/{mock => ideas}/drawing2.svg (100%) rename cooking/{mock => ideas}/monochrome.png (100%) rename cooking/{mock => ideas}/wav1.jpg (100%) rename cooking/{mock => ideas}/wav1.png (100%) rename cooking/{mock => ideas}/wav1.xcf (100%) rename cooking/{mock => ideas}/wav2.jpg (100%) rename cooking/{mock => ideas}/wav2.png (100%) rename cooking/{mock => ideas}/wav3.jpg (100%) rename cooking/{mock => ideas}/wav3.png (100%) rename cooking/{mock => ideas}/wav4.jpg (100%) rename cooking/{mock => ideas}/wav4.png (100%) rename cooking/{mock => ideas}/wav5.jpg (100%) rename cooking/{mock => ideas}/wav5.png (100%) rename cooking/{mock => ideas}/wav6.jpg (100%) rename cooking/{mock => ideas}/wav6.png (100%) rename cooking/{mock => ideas}/wav7.jpg (100%) rename cooking/{mock => ideas}/wav7.png (100%) rename cooking/{mock => ideas}/wav7.xcf (100%) rename cooking/{mock => ideas}/wav8.jpg (100%) rename cooking/{mock => ideas}/wav8.png (100%) rename cooking/{mock => ideas}/wav9.jpg (100%) rename cooking/{mock => ideas}/wav9.png (100%) rename {python => cooking/python}/_magicsquares.so (100%) rename {python => cooking/python}/features/__init__.py (100%) rename {python => cooking/python}/features/__init__.pyc (100%) rename {python => cooking/python}/features/base.py (100%) rename {python => cooking/python}/features/base.pyc (100%) rename {python => cooking/python}/features/sigproc.py (100%) rename {python => cooking/python}/features/sigproc.pyc (100%) rename {python => cooking/python}/magicsquares.py (100%) rename {python => cooking/python}/magicsquares.pyc (100%) rename {python => cooking/python}/samplebrain (100%) rename {python => cooking/python}/transponge-eigen.py (100%) rename {python => cooking/python}/transponge-gui.py (100%) rename {python => cooking/python}/transponge-mfcc.py (100%) rename {python => cooking/python}/transponge.py (100%) rename {sponge => cooking/sponge}/.gitignore (100%) rename {sponge => cooking/sponge}/README (100%) rename {sponge => cooking/sponge}/images/icon.png (100%) rename {sponge => cooking/sponge}/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.jar.md5 (100%) rename {sponge => cooking/sponge}/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.jar.sha1 (100%) rename {sponge => cooking/sponge}/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.pom (100%) rename {sponge => cooking/sponge}/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.pom.md5 (100%) rename {sponge => cooking/sponge}/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.pom.sha1 (100%) rename {sponge => cooking/sponge}/local_mvn_repo/local/comirva/0.36/comirva-0.36.jar.md5 (100%) rename {sponge => cooking/sponge}/local_mvn_repo/local/comirva/0.36/comirva-0.36.jar.sha1 (100%) rename {sponge => cooking/sponge}/local_mvn_repo/local/comirva/0.36/comirva-0.36.pom (100%) rename {sponge => cooking/sponge}/local_mvn_repo/local/comirva/0.36/comirva-0.36.pom.md5 (100%) rename {sponge => cooking/sponge}/local_mvn_repo/local/comirva/0.36/comirva-0.36.pom.sha1 (100%) rename {sponge => cooking/sponge}/local_mvn_repo/local/comirva/maven-metadata-local.xml (100%) rename {sponge => cooking/sponge}/local_mvn_repo/local/comirva/maven-metadata-local.xml.md5 (100%) rename {sponge => cooking/sponge}/local_mvn_repo/local/comirva/maven-metadata-local.xml.sha1 (100%) rename {sponge => cooking/sponge}/project.clj (100%) rename {sponge => cooking/sponge}/src/app/aggregate.clj (100%) rename {sponge => cooking/sponge}/src/app/block.clj (100%) rename {sponge => cooking/sponge}/src/app/blocklist.clj (100%) rename {sponge => cooking/sponge}/src/app/core.clj (100%) rename {sponge => cooking/sponge}/src/app/listen.clj (100%) rename {sponge => cooking/sponge}/src/app/wav.clj (100%) rename {sponge => cooking/sponge}/test/app/test/aggregate.clj (100%) rename {sponge => cooking/sponge}/test/app/test/block.clj (100%) rename {sponge => cooking/sponge}/test/app/test/blocklist.clj (100%) rename {sponge => cooking/sponge}/test/app/test/core.clj (100%) rename {sponge => cooking/sponge}/test/app/test/listen.clj (100%) rename test.cpp => cooking/test.cpp (100%) delete mode 100644 samplebrain/qt/samplebrain.pro delete mode 100644 transponge-mfcc.py diff --git a/samplebrain/qt/MainWindow.cpp b/app/MainWindow.cpp similarity index 100% rename from samplebrain/qt/MainWindow.cpp rename to app/MainWindow.cpp diff --git a/samplebrain/qt/MainWindow.h b/app/MainWindow.h similarity index 99% rename from samplebrain/qt/MainWindow.h rename to app/MainWindow.h index 43efd34..202e0f7 100644 --- a/samplebrain/qt/MainWindow.h +++ b/app/MainWindow.h @@ -24,7 +24,6 @@ #include #include #include -#include "window.h" #include "feedback.h" #include "sound_items.h" @@ -405,7 +404,7 @@ private: string m_save_wav; QString m_last_file; - u32 m_record_id; + unsigned int m_record_id; Ui_MainWindow m_Ui; feedback m_feedback; QSignalMapper* m_sound_item_enable_mapper; diff --git a/samplebrain/qt/audio_thread.cpp b/app/audio_thread.cpp similarity index 100% rename from samplebrain/qt/audio_thread.cpp rename to app/audio_thread.cpp diff --git a/samplebrain/qt/audio_thread.h b/app/audio_thread.h similarity index 95% rename from samplebrain/qt/audio_thread.h rename to app/audio_thread.h index 6d8db0e..2ea1174 100644 --- a/samplebrain/qt/audio_thread.h +++ b/app/audio_thread.h @@ -14,11 +14,11 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "jellyfish/OSC_server.h" +#include "spiralcore/OSC_server.h" +#include "spiralcore/audio.h" #include "process_thread.h" #include "renderer.h" #include "block_stream.h" -#include "jellyfish/audio.h" #pragma once diff --git a/samplebrain/qt/feedback.cpp b/app/feedback.cpp similarity index 100% rename from samplebrain/qt/feedback.cpp rename to app/feedback.cpp diff --git a/samplebrain/qt/feedback.h b/app/feedback.h similarity index 96% rename from samplebrain/qt/feedback.h rename to app/feedback.h index 7a5dc0e..9638f91 100644 --- a/samplebrain/qt/feedback.h +++ b/app/feedback.h @@ -17,7 +17,7 @@ #include #include #include -#include "jellyfish/OSC_server.h" +#include "spiralcore/OSC_server.h" #pragma once diff --git a/samplebrain/qt/generated/ui_sample.h b/app/generated/ui_sample.h similarity index 100% rename from samplebrain/qt/generated/ui_sample.h rename to app/generated/ui_sample.h diff --git a/samplebrain/qt/generated/ui_samplebrain.h b/app/generated/ui_samplebrain.h similarity index 99% rename from samplebrain/qt/generated/ui_samplebrain.h rename to app/generated/ui_samplebrain.h index 50d9403..3d9aabb 100644 --- a/samplebrain/qt/generated/ui_samplebrain.h +++ b/app/generated/ui_samplebrain.h @@ -1,13 +1,13 @@ /******************************************************************************** -** Form generated from reading UI file 'samplebrainKYyZZB.ui' +** Form generated from reading UI file 'samplebrainMnOjFX.ui' ** ** Created by: Qt User Interface Compiler version 5.12.8 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ -#ifndef SAMPLEBRAINKYYZZB_H -#define SAMPLEBRAINKYYZZB_H +#ifndef SAMPLEBRAINMNOJFX_H +#define SAMPLEBRAINMNOJFX_H #include #include @@ -162,7 +162,7 @@ public: { if (MainWindow->objectName().isEmpty()) MainWindow->setObjectName(QString::fromUtf8("MainWindow")); - MainWindow->resize(955, 832); + MainWindow->resize(1188, 898); centralwidget = new QWidget(MainWindow); centralwidget->setObjectName(QString::fromUtf8("centralwidget")); verticalLayout_4 = new QVBoxLayout(centralwidget); @@ -749,7 +749,7 @@ public: scrollArea->setWidgetResizable(true); scrollAreaWidgetContents = new QWidget(); scrollAreaWidgetContents->setObjectName(QString::fromUtf8("scrollAreaWidgetContents")); - scrollAreaWidgetContents->setGeometry(QRect(0, 0, 322, 198)); + scrollAreaWidgetContents->setGeometry(QRect(0, 0, 424, 198)); verticalLayout_5 = new QVBoxLayout(scrollAreaWidgetContents); verticalLayout_5->setObjectName(QString::fromUtf8("verticalLayout_5")); brain_contents = new QVBoxLayout(); @@ -1185,7 +1185,7 @@ public: pushButtonLoadBrain->setText(QApplication::translate("MainWindow", "load brain", nullptr)); pushButtonSaveBrain->setText(QApplication::translate("MainWindow", "save brain", nullptr)); tabWidget->setTabText(tabWidget->indexOf(controlTab), QApplication::translate("MainWindow", "search", nullptr)); - label_4->setText(QApplication::translate("MainWindow", "This program is free software made in Cornwall by FoAM Kernow", nullptr)); + label_4->setText(QApplication::translate("MainWindow", "

This program is free software made in Cornwall by Dave Griffiths at Then Try This

", nullptr)); tabWidget->setTabText(tabWidget->indexOf(netTab), QApplication::translate("MainWindow", "net", nullptr)); pushButtonPlay->setText(QString()); pushButtonStop->setText(QString()); @@ -1204,4 +1204,4 @@ namespace Ui { QT_END_NAMESPACE -#endif // SAMPLEBRAINKYYZZB_H +#endif // SAMPLEBRAINMNOJFX_H diff --git a/samplebrain/qt/icon/samplebrain-icon.icns b/app/icon/samplebrain-icon.icns similarity index 100% rename from samplebrain/qt/icon/samplebrain-icon.icns rename to app/icon/samplebrain-icon.icns diff --git a/samplebrain/qt/images/at.jpg b/app/images/at.jpg similarity index 100% rename from samplebrain/qt/images/at.jpg rename to app/images/at.jpg diff --git a/samplebrain/qt/images/at.png b/app/images/at.png similarity index 100% rename from samplebrain/qt/images/at.png rename to app/images/at.png diff --git a/samplebrain/qt/images/pause.png b/app/images/pause.png similarity index 100% rename from samplebrain/qt/images/pause.png rename to app/images/pause.png diff --git a/samplebrain/qt/images/play.png b/app/images/play.png similarity index 100% rename from samplebrain/qt/images/play.png rename to app/images/play.png diff --git a/samplebrain/qt/images/record.png b/app/images/record.png similarity index 100% rename from samplebrain/qt/images/record.png rename to app/images/record.png diff --git a/samplebrain/qt/images/stop.png b/app/images/stop.png similarity index 100% rename from samplebrain/qt/images/stop.png rename to app/images/stop.png diff --git a/samplebrain/qt/notes.txt b/app/notes.txt similarity index 100% rename from samplebrain/qt/notes.txt rename to app/notes.txt diff --git a/samplebrain/qt/process_thread.cpp b/app/process_thread.cpp similarity index 100% rename from samplebrain/qt/process_thread.cpp rename to app/process_thread.cpp diff --git a/samplebrain/qt/process_thread.h b/app/process_thread.h similarity index 98% rename from samplebrain/qt/process_thread.h rename to app/process_thread.h index 134dbdd..c68517c 100644 --- a/samplebrain/qt/process_thread.h +++ b/app/process_thread.h @@ -14,7 +14,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "jellyfish/OSC_server.h" +#include "spiralcore/OSC_server.h" #include "brain.h" #include "renderer.h" #include "block_stream.h" diff --git a/samplebrain/qt/qtmain.cpp b/app/qtmain.cpp similarity index 100% rename from samplebrain/qt/qtmain.cpp rename to app/qtmain.cpp diff --git a/app/samplebrain.pro b/app/samplebrain.pro new file mode 100644 index 0000000..2c69e65 --- /dev/null +++ b/app/samplebrain.pro @@ -0,0 +1,50 @@ +###################################################################### +# Automatically generated by qmake (2.01a) Sun Jul 5 17:49:45 2015 +###################################################################### + +TEMPLATE = app +TARGET = samplebrain +DEPENDPATH += . 2 +INCLUDEPATH += . 2 + +QT += core gui widgets + +# Input +HEADERS += MainWindow.h \ + generated/ui_samplebrain.h \ + +SOURCES += MainWindow.cpp \ + sound_items.cpp \ + audio_thread.cpp \ + process_thread.cpp \ + feedback.cpp \ + qtmain.cpp \ + ../brain/src/block.cpp \ + ../brain/src/brain.cpp \ + ../brain/src/fft.cpp \ + ../brain/src/mfcc.cpp \ + ../brain/src/renderer.cpp \ + ../brain/src/search_params.cpp \ + ../brain/src/status.cpp \ + ../brain/src/window.cpp \ + ../brain/src/block_stream.cpp \ + ../brain/src/aquila/filter/MelFilterBank.cpp \ + ../brain/src/aquila/filter/MelFilter.cpp \ + ../brain/src/aquila/transform/Dct.cpp \ + ../brain/src/spiralcore/sample.cpp \ + ../brain/src/spiralcore/ring_buffer.cpp \ + ../brain/src/spiralcore/command_ring_buffer.cpp \ + ../brain/src/spiralcore/portaudio_client.cpp \ + ../brain/src/spiralcore/audio.cpp \ + ../brain/src/spiralcore/OSC_server.cpp \ + ../brain/src/spiralcore/allocator.cpp \ + ../brain/src/spiralcore/stream.cpp + +INCLUDEPATH += ../brain/src +LIBS += -L.. -lportaudio -lfftw3 -lsndfile -llo -ldl -lpthread -lm +CONFIG+=debug + +QMAKE_CXXFLAGS += -Wall -Wno-unused -std=c++11 + +# assets +RESOURCES = samplebrain.qrc diff --git a/samplebrain/qt/samplebrain.qrc b/app/samplebrain.qrc similarity index 100% rename from samplebrain/qt/samplebrain.qrc rename to app/samplebrain.qrc diff --git a/samplebrain/qt/sound_items.cpp b/app/sound_items.cpp similarity index 99% rename from samplebrain/qt/sound_items.cpp rename to app/sound_items.cpp index aff5cd4..e1cd24d 100644 --- a/samplebrain/qt/sound_items.cpp +++ b/app/sound_items.cpp @@ -17,7 +17,7 @@ #include #include #include -#include "jellyfish/types.h" +#include "spiralcore/types.h" #include "sound_items.h" diff --git a/samplebrain/qt/sound_items.h b/app/sound_items.h similarity index 100% rename from samplebrain/qt/sound_items.h rename to app/sound_items.h diff --git a/samplebrain/Makefile.in b/brain/Makefile.in similarity index 74% rename from samplebrain/Makefile.in rename to brain/Makefile.in index 67aeb3b..e57bcad 100644 --- a/samplebrain/Makefile.in +++ b/brain/Makefile.in @@ -1,17 +1,28 @@ TARGET := samplebrain TARGET_LIB := libsamplebrain.a -SRCS := src/fft.cpp \ - src/brain.cpp \ - src/block.cpp \ - src/main.cpp \ - src/mfcc.cpp \ +SRCS := src/block.cpp \ + src/block_stream.cpp \ + src/brain.cpp \ + src/fft.cpp \ + src/main.cpp \ + src/mfcc.cpp \ src/renderer.cpp \ - src/window.cpp \ + src/search_params.cpp \ src/status.cpp \ + src/window.cpp \ src/aquila/filter/MelFilterBank.cpp \ src/aquila/filter/MelFilter.cpp \ src/aquila/transform/Dct.cpp \ + src/spiralcore/allocator.cpp \ + src/spiralcore/audio.cpp \ + src/spiralcore/command_ring_buffer.cpp \ + src/spiralcore/OSC_server.cpp \ + src/spiralcore/portaudio_client.cpp \ + src/spiralcore/ring_buffer.cpp \ + src/spiralcore/sample.cpp \ + src/spiralcore/stream.cpp + TARGET_SRCS := src/main.cpp diff --git a/samplebrain/configure b/brain/configure similarity index 96% rename from samplebrain/configure rename to brain/configure index 05528ce..88af77c 100755 --- a/samplebrain/configure +++ b/brain/configure @@ -1,11 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for samplebrain version-0.1. +# Generated by GNU Autoconf 2.69 for samplebrain version-0.1. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -134,6 +132,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -212,21 +236,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -328,6 +356,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -449,6 +485,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -483,16 +523,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -504,28 +544,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -632,6 +652,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -705,6 +726,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -957,6 +979,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1094,7 +1125,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1122,8 +1153,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1249,6 +1278,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1353,9 +1383,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF samplebrain configure version-0.1 -generated by GNU Autoconf 2.68 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1431,7 +1461,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1689,7 +1719,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by samplebrain $as_me version-0.1, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2059,7 +2089,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2099,7 +2129,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2152,7 +2182,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2193,7 +2223,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -2251,7 +2281,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2295,7 +2325,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2741,8 +2771,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -2874,6 +2903,45 @@ _ACEOF fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5 +$as_echo_n "checking for main in -lpthread... " >&6; } +if ${ac_cv_lib_pthread_main+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpthread $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pthread_main=yes +else + ac_cv_lib_pthread_main=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_main" >&5 +$as_echo "$ac_cv_lib_pthread_main" >&6; } +if test "x$ac_cv_lib_pthread_main" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBPTHREAD 1 +_ACEOF + + LIBS="-lpthread $LIBS" + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lfftw3" >&5 $as_echo_n "checking for main in -lfftw3... " >&6; } if ${ac_cv_lib_fftw3_main+:} false; then : @@ -3098,7 +3166,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3142,7 +3210,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3484,7 +3552,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -3550,7 +3618,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4151,16 +4219,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -4220,28 +4288,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -4263,7 +4319,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by samplebrain $as_me version-0.1, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -4325,10 +4381,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ samplebrain config.status version-0.1 -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -4416,7 +4472,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' diff --git a/samplebrain/configure.ac b/brain/configure.ac similarity index 92% rename from samplebrain/configure.ac rename to brain/configure.ac index 7e7a448..2ec52e4 100644 --- a/samplebrain/configure.ac +++ b/brain/configure.ac @@ -3,6 +3,7 @@ AC_INIT(samplebrain, version-0.1) AC_PROG_CC AC_CHECK_LIB(m, cos) +AC_CHECK_LIB(pthread, main) AC_CHECK_LIB(fftw3, main) AC_CHECK_LIB(portaudio, main) AC_CHECK_LIB(jellyfish, main) diff --git a/samplebrain/dist.sh b/brain/dist.sh similarity index 100% rename from samplebrain/dist.sh rename to brain/dist.sh diff --git a/samplebrain/interface/buttons.svg b/brain/interface/buttons.svg similarity index 100% rename from samplebrain/interface/buttons.svg rename to brain/interface/buttons.svg diff --git a/samplebrain/interface/sample.ui b/brain/interface/sample.ui similarity index 100% rename from samplebrain/interface/sample.ui rename to brain/interface/sample.ui diff --git a/samplebrain/interface/samplebrain.ui b/brain/interface/samplebrain.ui similarity index 99% rename from samplebrain/interface/samplebrain.ui rename to brain/interface/samplebrain.ui index b50e022..3cc8ab7 100644 --- a/samplebrain/interface/samplebrain.ui +++ b/brain/interface/samplebrain.ui @@ -6,8 +6,8 @@ 0 0 - 955 - 832 + 1188 + 898 @@ -1145,7 +1145,7 @@ 0 0 - 322 + 424 198 @@ -1409,7 +1409,7 @@ - This program is free software made in Cornwall by <a href="http://fo.am/kernow">FoAM Kernow</a> + <html><head/><body><p>This program is free software made in Cornwall by Dave Griffiths at <a href="https://thentrythis.org"><span style=" text-decoration: underline; color:#0000ff;">Then Try This</span></a></p></body></html> diff --git a/samplebrain/replace.py b/brain/replace.py similarity index 100% rename from samplebrain/replace.py rename to brain/replace.py diff --git a/samplebrain/src/aquila/Exceptions.h b/brain/src/aquila/Exceptions.h similarity index 100% rename from samplebrain/src/aquila/Exceptions.h rename to brain/src/aquila/Exceptions.h diff --git a/samplebrain/src/aquila/aquila.h b/brain/src/aquila/aquila.h similarity index 100% rename from samplebrain/src/aquila/aquila.h rename to brain/src/aquila/aquila.h diff --git a/samplebrain/src/aquila/filter.h b/brain/src/aquila/filter.h similarity index 100% rename from samplebrain/src/aquila/filter.h rename to brain/src/aquila/filter.h diff --git a/samplebrain/src/aquila/filter/MelFilter.cpp b/brain/src/aquila/filter/MelFilter.cpp similarity index 100% rename from samplebrain/src/aquila/filter/MelFilter.cpp rename to brain/src/aquila/filter/MelFilter.cpp diff --git a/samplebrain/src/aquila/filter/MelFilter.dep b/brain/src/aquila/filter/MelFilter.dep similarity index 100% rename from samplebrain/src/aquila/filter/MelFilter.dep rename to brain/src/aquila/filter/MelFilter.dep diff --git a/samplebrain/src/aquila/filter/MelFilter.h b/brain/src/aquila/filter/MelFilter.h similarity index 100% rename from samplebrain/src/aquila/filter/MelFilter.h rename to brain/src/aquila/filter/MelFilter.h diff --git a/samplebrain/src/aquila/filter/MelFilterBank.cpp b/brain/src/aquila/filter/MelFilterBank.cpp similarity index 100% rename from samplebrain/src/aquila/filter/MelFilterBank.cpp rename to brain/src/aquila/filter/MelFilterBank.cpp diff --git a/samplebrain/src/aquila/filter/MelFilterBank.dep b/brain/src/aquila/filter/MelFilterBank.dep similarity index 100% rename from samplebrain/src/aquila/filter/MelFilterBank.dep rename to brain/src/aquila/filter/MelFilterBank.dep diff --git a/samplebrain/src/aquila/filter/MelFilterBank.h b/brain/src/aquila/filter/MelFilterBank.h similarity index 100% rename from samplebrain/src/aquila/filter/MelFilterBank.h rename to brain/src/aquila/filter/MelFilterBank.h diff --git a/samplebrain/src/aquila/functions.h b/brain/src/aquila/functions.h similarity index 100% rename from samplebrain/src/aquila/functions.h rename to brain/src/aquila/functions.h diff --git a/samplebrain/src/aquila/global.h b/brain/src/aquila/global.h similarity index 100% rename from samplebrain/src/aquila/global.h rename to brain/src/aquila/global.h diff --git a/samplebrain/src/aquila/ml.h b/brain/src/aquila/ml.h similarity index 100% rename from samplebrain/src/aquila/ml.h rename to brain/src/aquila/ml.h diff --git a/samplebrain/src/aquila/ml/Dtw.cpp b/brain/src/aquila/ml/Dtw.cpp similarity index 100% rename from samplebrain/src/aquila/ml/Dtw.cpp rename to brain/src/aquila/ml/Dtw.cpp diff --git a/samplebrain/src/aquila/ml/Dtw.h b/brain/src/aquila/ml/Dtw.h similarity index 100% rename from samplebrain/src/aquila/ml/Dtw.h rename to brain/src/aquila/ml/Dtw.h diff --git a/samplebrain/src/aquila/ml/DtwPoint.h b/brain/src/aquila/ml/DtwPoint.h similarity index 100% rename from samplebrain/src/aquila/ml/DtwPoint.h rename to brain/src/aquila/ml/DtwPoint.h diff --git a/samplebrain/src/aquila/source.h b/brain/src/aquila/source.h similarity index 100% rename from samplebrain/src/aquila/source.h rename to brain/src/aquila/source.h diff --git a/samplebrain/src/aquila/source/Frame.cpp b/brain/src/aquila/source/Frame.cpp similarity index 100% rename from samplebrain/src/aquila/source/Frame.cpp rename to brain/src/aquila/source/Frame.cpp diff --git a/samplebrain/src/aquila/source/Frame.h b/brain/src/aquila/source/Frame.h similarity index 100% rename from samplebrain/src/aquila/source/Frame.h rename to brain/src/aquila/source/Frame.h diff --git a/samplebrain/src/aquila/source/FramesCollection.cpp b/brain/src/aquila/source/FramesCollection.cpp similarity index 100% rename from samplebrain/src/aquila/source/FramesCollection.cpp rename to brain/src/aquila/source/FramesCollection.cpp diff --git a/samplebrain/src/aquila/source/FramesCollection.h b/brain/src/aquila/source/FramesCollection.h similarity index 100% rename from samplebrain/src/aquila/source/FramesCollection.h rename to brain/src/aquila/source/FramesCollection.h diff --git a/samplebrain/src/aquila/source/PlainTextFile.cpp b/brain/src/aquila/source/PlainTextFile.cpp similarity index 100% rename from samplebrain/src/aquila/source/PlainTextFile.cpp rename to brain/src/aquila/source/PlainTextFile.cpp diff --git a/samplebrain/src/aquila/source/PlainTextFile.h b/brain/src/aquila/source/PlainTextFile.h similarity index 100% rename from samplebrain/src/aquila/source/PlainTextFile.h rename to brain/src/aquila/source/PlainTextFile.h diff --git a/samplebrain/src/aquila/source/RawPcmFile.h b/brain/src/aquila/source/RawPcmFile.h similarity index 100% rename from samplebrain/src/aquila/source/RawPcmFile.h rename to brain/src/aquila/source/RawPcmFile.h diff --git a/samplebrain/src/aquila/source/SignalSource.cpp b/brain/src/aquila/source/SignalSource.cpp similarity index 100% rename from samplebrain/src/aquila/source/SignalSource.cpp rename to brain/src/aquila/source/SignalSource.cpp diff --git a/samplebrain/src/aquila/source/SignalSource.h b/brain/src/aquila/source/SignalSource.h similarity index 100% rename from samplebrain/src/aquila/source/SignalSource.h rename to brain/src/aquila/source/SignalSource.h diff --git a/samplebrain/src/aquila/source/WaveFile.cpp b/brain/src/aquila/source/WaveFile.cpp similarity index 100% rename from samplebrain/src/aquila/source/WaveFile.cpp rename to brain/src/aquila/source/WaveFile.cpp diff --git a/samplebrain/src/aquila/source/WaveFile.h b/brain/src/aquila/source/WaveFile.h similarity index 100% rename from samplebrain/src/aquila/source/WaveFile.h rename to brain/src/aquila/source/WaveFile.h diff --git a/samplebrain/src/aquila/source/WaveFileHandler.cpp b/brain/src/aquila/source/WaveFileHandler.cpp similarity index 100% rename from samplebrain/src/aquila/source/WaveFileHandler.cpp rename to brain/src/aquila/source/WaveFileHandler.cpp diff --git a/samplebrain/src/aquila/source/WaveFileHandler.h b/brain/src/aquila/source/WaveFileHandler.h similarity index 100% rename from samplebrain/src/aquila/source/WaveFileHandler.h rename to brain/src/aquila/source/WaveFileHandler.h diff --git a/samplebrain/src/aquila/source/generator/Generator.cpp b/brain/src/aquila/source/generator/Generator.cpp similarity index 100% rename from samplebrain/src/aquila/source/generator/Generator.cpp rename to brain/src/aquila/source/generator/Generator.cpp diff --git a/samplebrain/src/aquila/source/generator/Generator.h b/brain/src/aquila/source/generator/Generator.h similarity index 100% rename from samplebrain/src/aquila/source/generator/Generator.h rename to brain/src/aquila/source/generator/Generator.h diff --git a/samplebrain/src/aquila/source/generator/PinkNoiseGenerator.cpp b/brain/src/aquila/source/generator/PinkNoiseGenerator.cpp similarity index 100% rename from samplebrain/src/aquila/source/generator/PinkNoiseGenerator.cpp rename to brain/src/aquila/source/generator/PinkNoiseGenerator.cpp diff --git a/samplebrain/src/aquila/source/generator/PinkNoiseGenerator.h b/brain/src/aquila/source/generator/PinkNoiseGenerator.h similarity index 100% rename from samplebrain/src/aquila/source/generator/PinkNoiseGenerator.h rename to brain/src/aquila/source/generator/PinkNoiseGenerator.h diff --git a/samplebrain/src/aquila/source/generator/SineGenerator.cpp b/brain/src/aquila/source/generator/SineGenerator.cpp similarity index 100% rename from samplebrain/src/aquila/source/generator/SineGenerator.cpp rename to brain/src/aquila/source/generator/SineGenerator.cpp diff --git a/samplebrain/src/aquila/source/generator/SineGenerator.h b/brain/src/aquila/source/generator/SineGenerator.h similarity index 100% rename from samplebrain/src/aquila/source/generator/SineGenerator.h rename to brain/src/aquila/source/generator/SineGenerator.h diff --git a/samplebrain/src/aquila/source/generator/SquareGenerator.cpp b/brain/src/aquila/source/generator/SquareGenerator.cpp similarity index 100% rename from samplebrain/src/aquila/source/generator/SquareGenerator.cpp rename to brain/src/aquila/source/generator/SquareGenerator.cpp diff --git a/samplebrain/src/aquila/source/generator/SquareGenerator.h b/brain/src/aquila/source/generator/SquareGenerator.h similarity index 100% rename from samplebrain/src/aquila/source/generator/SquareGenerator.h rename to brain/src/aquila/source/generator/SquareGenerator.h diff --git a/samplebrain/src/aquila/source/generator/TriangleGenerator.cpp b/brain/src/aquila/source/generator/TriangleGenerator.cpp similarity index 100% rename from samplebrain/src/aquila/source/generator/TriangleGenerator.cpp rename to brain/src/aquila/source/generator/TriangleGenerator.cpp diff --git a/samplebrain/src/aquila/source/generator/TriangleGenerator.h b/brain/src/aquila/source/generator/TriangleGenerator.h similarity index 100% rename from samplebrain/src/aquila/source/generator/TriangleGenerator.h rename to brain/src/aquila/source/generator/TriangleGenerator.h diff --git a/samplebrain/src/aquila/source/generator/WhiteNoiseGenerator.cpp b/brain/src/aquila/source/generator/WhiteNoiseGenerator.cpp similarity index 100% rename from samplebrain/src/aquila/source/generator/WhiteNoiseGenerator.cpp rename to brain/src/aquila/source/generator/WhiteNoiseGenerator.cpp diff --git a/samplebrain/src/aquila/source/generator/WhiteNoiseGenerator.h b/brain/src/aquila/source/generator/WhiteNoiseGenerator.h similarity index 100% rename from samplebrain/src/aquila/source/generator/WhiteNoiseGenerator.h rename to brain/src/aquila/source/generator/WhiteNoiseGenerator.h diff --git a/samplebrain/src/aquila/source/window/BarlettWindow.cpp b/brain/src/aquila/source/window/BarlettWindow.cpp similarity index 100% rename from samplebrain/src/aquila/source/window/BarlettWindow.cpp rename to brain/src/aquila/source/window/BarlettWindow.cpp diff --git a/samplebrain/src/aquila/source/window/BarlettWindow.h b/brain/src/aquila/source/window/BarlettWindow.h similarity index 100% rename from samplebrain/src/aquila/source/window/BarlettWindow.h rename to brain/src/aquila/source/window/BarlettWindow.h diff --git a/samplebrain/src/aquila/source/window/BlackmanWindow.cpp b/brain/src/aquila/source/window/BlackmanWindow.cpp similarity index 100% rename from samplebrain/src/aquila/source/window/BlackmanWindow.cpp rename to brain/src/aquila/source/window/BlackmanWindow.cpp diff --git a/samplebrain/src/aquila/source/window/BlackmanWindow.h b/brain/src/aquila/source/window/BlackmanWindow.h similarity index 100% rename from samplebrain/src/aquila/source/window/BlackmanWindow.h rename to brain/src/aquila/source/window/BlackmanWindow.h diff --git a/samplebrain/src/aquila/source/window/FlattopWindow.cpp b/brain/src/aquila/source/window/FlattopWindow.cpp similarity index 100% rename from samplebrain/src/aquila/source/window/FlattopWindow.cpp rename to brain/src/aquila/source/window/FlattopWindow.cpp diff --git a/samplebrain/src/aquila/source/window/FlattopWindow.h b/brain/src/aquila/source/window/FlattopWindow.h similarity index 100% rename from samplebrain/src/aquila/source/window/FlattopWindow.h rename to brain/src/aquila/source/window/FlattopWindow.h diff --git a/samplebrain/src/aquila/source/window/GaussianWindow.cpp b/brain/src/aquila/source/window/GaussianWindow.cpp similarity index 100% rename from samplebrain/src/aquila/source/window/GaussianWindow.cpp rename to brain/src/aquila/source/window/GaussianWindow.cpp diff --git a/samplebrain/src/aquila/source/window/GaussianWindow.h b/brain/src/aquila/source/window/GaussianWindow.h similarity index 100% rename from samplebrain/src/aquila/source/window/GaussianWindow.h rename to brain/src/aquila/source/window/GaussianWindow.h diff --git a/samplebrain/src/aquila/source/window/HammingWindow.cpp b/brain/src/aquila/source/window/HammingWindow.cpp similarity index 100% rename from samplebrain/src/aquila/source/window/HammingWindow.cpp rename to brain/src/aquila/source/window/HammingWindow.cpp diff --git a/samplebrain/src/aquila/source/window/HammingWindow.h b/brain/src/aquila/source/window/HammingWindow.h similarity index 100% rename from samplebrain/src/aquila/source/window/HammingWindow.h rename to brain/src/aquila/source/window/HammingWindow.h diff --git a/samplebrain/src/aquila/source/window/HannWindow.cpp b/brain/src/aquila/source/window/HannWindow.cpp similarity index 100% rename from samplebrain/src/aquila/source/window/HannWindow.cpp rename to brain/src/aquila/source/window/HannWindow.cpp diff --git a/samplebrain/src/aquila/source/window/HannWindow.h b/brain/src/aquila/source/window/HannWindow.h similarity index 100% rename from samplebrain/src/aquila/source/window/HannWindow.h rename to brain/src/aquila/source/window/HannWindow.h diff --git a/samplebrain/src/aquila/source/window/RectangularWindow.h b/brain/src/aquila/source/window/RectangularWindow.h similarity index 100% rename from samplebrain/src/aquila/source/window/RectangularWindow.h rename to brain/src/aquila/source/window/RectangularWindow.h diff --git a/samplebrain/src/aquila/synth.h b/brain/src/aquila/synth.h similarity index 100% rename from samplebrain/src/aquila/synth.h rename to brain/src/aquila/synth.h diff --git a/samplebrain/src/aquila/synth/KarplusStrongSynthesizer.cpp b/brain/src/aquila/synth/KarplusStrongSynthesizer.cpp similarity index 100% rename from samplebrain/src/aquila/synth/KarplusStrongSynthesizer.cpp rename to brain/src/aquila/synth/KarplusStrongSynthesizer.cpp diff --git a/samplebrain/src/aquila/synth/KarplusStrongSynthesizer.h b/brain/src/aquila/synth/KarplusStrongSynthesizer.h similarity index 100% rename from samplebrain/src/aquila/synth/KarplusStrongSynthesizer.h rename to brain/src/aquila/synth/KarplusStrongSynthesizer.h diff --git a/samplebrain/src/aquila/synth/SineSynthesizer.cpp b/brain/src/aquila/synth/SineSynthesizer.cpp similarity index 100% rename from samplebrain/src/aquila/synth/SineSynthesizer.cpp rename to brain/src/aquila/synth/SineSynthesizer.cpp diff --git a/samplebrain/src/aquila/synth/SineSynthesizer.h b/brain/src/aquila/synth/SineSynthesizer.h similarity index 100% rename from samplebrain/src/aquila/synth/SineSynthesizer.h rename to brain/src/aquila/synth/SineSynthesizer.h diff --git a/samplebrain/src/aquila/synth/Synthesizer.cpp b/brain/src/aquila/synth/Synthesizer.cpp similarity index 100% rename from samplebrain/src/aquila/synth/Synthesizer.cpp rename to brain/src/aquila/synth/Synthesizer.cpp diff --git a/samplebrain/src/aquila/synth/Synthesizer.h b/brain/src/aquila/synth/Synthesizer.h similarity index 100% rename from samplebrain/src/aquila/synth/Synthesizer.h rename to brain/src/aquila/synth/Synthesizer.h diff --git a/samplebrain/src/aquila/tools.h b/brain/src/aquila/tools.h similarity index 100% rename from samplebrain/src/aquila/tools.h rename to brain/src/aquila/tools.h diff --git a/samplebrain/src/aquila/tools/TextPlot.cpp b/brain/src/aquila/tools/TextPlot.cpp similarity index 100% rename from samplebrain/src/aquila/tools/TextPlot.cpp rename to brain/src/aquila/tools/TextPlot.cpp diff --git a/samplebrain/src/aquila/tools/TextPlot.h b/brain/src/aquila/tools/TextPlot.h similarity index 100% rename from samplebrain/src/aquila/tools/TextPlot.h rename to brain/src/aquila/tools/TextPlot.h diff --git a/samplebrain/src/aquila/transform.h b/brain/src/aquila/transform.h similarity index 100% rename from samplebrain/src/aquila/transform.h rename to brain/src/aquila/transform.h diff --git a/samplebrain/src/aquila/transform/AquilaFft.cpp b/brain/src/aquila/transform/AquilaFft.cpp similarity index 100% rename from samplebrain/src/aquila/transform/AquilaFft.cpp rename to brain/src/aquila/transform/AquilaFft.cpp diff --git a/samplebrain/src/aquila/transform/AquilaFft.h b/brain/src/aquila/transform/AquilaFft.h similarity index 100% rename from samplebrain/src/aquila/transform/AquilaFft.h rename to brain/src/aquila/transform/AquilaFft.h diff --git a/samplebrain/src/aquila/transform/Dct.cpp b/brain/src/aquila/transform/Dct.cpp similarity index 100% rename from samplebrain/src/aquila/transform/Dct.cpp rename to brain/src/aquila/transform/Dct.cpp diff --git a/samplebrain/src/aquila/transform/Dct.dep b/brain/src/aquila/transform/Dct.dep similarity index 100% rename from samplebrain/src/aquila/transform/Dct.dep rename to brain/src/aquila/transform/Dct.dep diff --git a/samplebrain/src/aquila/transform/Dct.h b/brain/src/aquila/transform/Dct.h similarity index 100% rename from samplebrain/src/aquila/transform/Dct.h rename to brain/src/aquila/transform/Dct.h diff --git a/samplebrain/src/aquila/transform/Dft.cpp b/brain/src/aquila/transform/Dft.cpp similarity index 100% rename from samplebrain/src/aquila/transform/Dft.cpp rename to brain/src/aquila/transform/Dft.cpp diff --git a/samplebrain/src/aquila/transform/Dft.dep b/brain/src/aquila/transform/Dft.dep similarity index 100% rename from samplebrain/src/aquila/transform/Dft.dep rename to brain/src/aquila/transform/Dft.dep diff --git a/samplebrain/src/aquila/transform/Dft.h b/brain/src/aquila/transform/Dft.h similarity index 100% rename from samplebrain/src/aquila/transform/Dft.h rename to brain/src/aquila/transform/Dft.h diff --git a/samplebrain/src/aquila/transform/Fft.h b/brain/src/aquila/transform/Fft.h similarity index 100% rename from samplebrain/src/aquila/transform/Fft.h rename to brain/src/aquila/transform/Fft.h diff --git a/samplebrain/src/aquila/transform/FftFactory.cpp b/brain/src/aquila/transform/FftFactory.cpp similarity index 100% rename from samplebrain/src/aquila/transform/FftFactory.cpp rename to brain/src/aquila/transform/FftFactory.cpp diff --git a/samplebrain/src/aquila/transform/FftFactory.dep b/brain/src/aquila/transform/FftFactory.dep similarity index 100% rename from samplebrain/src/aquila/transform/FftFactory.dep rename to brain/src/aquila/transform/FftFactory.dep diff --git a/samplebrain/src/aquila/transform/FftFactory.h b/brain/src/aquila/transform/FftFactory.h similarity index 100% rename from samplebrain/src/aquila/transform/FftFactory.h rename to brain/src/aquila/transform/FftFactory.h diff --git a/samplebrain/src/aquila/transform/Mfcc.cpp b/brain/src/aquila/transform/Mfcc.cpp similarity index 100% rename from samplebrain/src/aquila/transform/Mfcc.cpp rename to brain/src/aquila/transform/Mfcc.cpp diff --git a/samplebrain/src/aquila/transform/Mfcc.h b/brain/src/aquila/transform/Mfcc.h similarity index 100% rename from samplebrain/src/aquila/transform/Mfcc.h rename to brain/src/aquila/transform/Mfcc.h diff --git a/samplebrain/src/aquila/transform/OouraFft.cpp b/brain/src/aquila/transform/OouraFft.cpp similarity index 100% rename from samplebrain/src/aquila/transform/OouraFft.cpp rename to brain/src/aquila/transform/OouraFft.cpp diff --git a/samplebrain/src/aquila/transform/OouraFft.dep b/brain/src/aquila/transform/OouraFft.dep similarity index 100% rename from samplebrain/src/aquila/transform/OouraFft.dep rename to brain/src/aquila/transform/OouraFft.dep diff --git a/samplebrain/src/aquila/transform/OouraFft.h b/brain/src/aquila/transform/OouraFft.h similarity index 100% rename from samplebrain/src/aquila/transform/OouraFft.h rename to brain/src/aquila/transform/OouraFft.h diff --git a/samplebrain/src/aquila/transform/Spectrogram.cpp b/brain/src/aquila/transform/Spectrogram.cpp similarity index 100% rename from samplebrain/src/aquila/transform/Spectrogram.cpp rename to brain/src/aquila/transform/Spectrogram.cpp diff --git a/samplebrain/src/aquila/transform/Spectrogram.h b/brain/src/aquila/transform/Spectrogram.h similarity index 100% rename from samplebrain/src/aquila/transform/Spectrogram.h rename to brain/src/aquila/transform/Spectrogram.h diff --git a/samplebrain/src/aquila/wrappers/SoundBufferAdapter.cpp b/brain/src/aquila/wrappers/SoundBufferAdapter.cpp similarity index 100% rename from samplebrain/src/aquila/wrappers/SoundBufferAdapter.cpp rename to brain/src/aquila/wrappers/SoundBufferAdapter.cpp diff --git a/samplebrain/src/aquila/wrappers/SoundBufferAdapter.h b/brain/src/aquila/wrappers/SoundBufferAdapter.h similarity index 100% rename from samplebrain/src/aquila/wrappers/SoundBufferAdapter.h rename to brain/src/aquila/wrappers/SoundBufferAdapter.h diff --git a/samplebrain/src/block.cpp b/brain/src/block.cpp similarity index 100% rename from samplebrain/src/block.cpp rename to brain/src/block.cpp diff --git a/samplebrain/src/block.h b/brain/src/block.h similarity index 96% rename from samplebrain/src/block.h rename to brain/src/block.h index 88170e3..dee593b 100644 --- a/samplebrain/src/block.h +++ b/brain/src/block.h @@ -16,13 +16,13 @@ #include #include -#include "jellyfish/sample.h" -#include "jellyfish/types.h" +#include "spiralcore/sample.h" +#include "spiralcore/types.h" #include "fft.h" #include "mfcc.h" #include "search_params.h" #include "window.h" -#include "jellyfish/stream.h" +#include "spiralcore/stream.h" #ifndef BLOCK #define BLOCK diff --git a/samplebrain/src/block_source.h b/brain/src/block_source.h similarity index 100% rename from samplebrain/src/block_source.h rename to brain/src/block_source.h diff --git a/samplebrain/src/block_stream.cpp b/brain/src/block_stream.cpp similarity index 100% rename from samplebrain/src/block_stream.cpp rename to brain/src/block_stream.cpp diff --git a/samplebrain/src/block_stream.h b/brain/src/block_stream.h similarity index 98% rename from samplebrain/src/block_stream.h rename to brain/src/block_stream.h index 676351f..d8393d1 100644 --- a/samplebrain/src/block_stream.h +++ b/brain/src/block_stream.h @@ -17,7 +17,7 @@ #include #include "window.h" #include "block.h" -#include "jellyfish/sample.h" +#include "spiralcore/sample.h" #include "block_source.h" #ifndef BLOCK_STREAM diff --git a/samplebrain/src/brain.cpp b/brain/src/brain.cpp similarity index 99% rename from samplebrain/src/brain.cpp rename to brain/src/brain.cpp index 257dfdc..b83f2c8 100644 --- a/samplebrain/src/brain.cpp +++ b/brain/src/brain.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "brain.h" #include "status.h" diff --git a/samplebrain/src/brain.h b/brain/src/brain.h similarity index 98% rename from samplebrain/src/brain.h rename to brain/src/brain.h index bbca496..608baea 100644 --- a/samplebrain/src/brain.h +++ b/brain/src/brain.h @@ -17,8 +17,8 @@ #include #include #include -#include "jellyfish/types.h" -#include "jellyfish/sample.h" +#include "spiralcore/types.h" +#include "spiralcore/sample.h" #include "block_source.h" #include "block.h" #include "search_params.h" diff --git a/samplebrain/src/config.h.in b/brain/src/config.h.in similarity index 100% rename from samplebrain/src/config.h.in rename to brain/src/config.h.in diff --git a/samplebrain/src/fft.cpp b/brain/src/fft.cpp similarity index 100% rename from samplebrain/src/fft.cpp rename to brain/src/fft.cpp diff --git a/samplebrain/src/fft.h b/brain/src/fft.h similarity index 97% rename from samplebrain/src/fft.h rename to brain/src/fft.h index a9e1f28..cce8a9b 100644 --- a/samplebrain/src/fft.h +++ b/brain/src/fft.h @@ -15,7 +15,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include -#include +#include #ifndef SPIRALCORE_FFT #define SPIRALCORE_FFT diff --git a/samplebrain/src/main.cpp b/brain/src/main.cpp similarity index 99% rename from samplebrain/src/main.cpp rename to brain/src/main.cpp index 91ce2c9..508eebe 100644 --- a/samplebrain/src/main.cpp +++ b/brain/src/main.cpp @@ -20,7 +20,7 @@ #include #include -#include "jellyfish/audio.h" +#include "spiralcore/audio.h" #include "block.h" #include "brain.h" diff --git a/samplebrain/src/mfcc.cpp b/brain/src/mfcc.cpp similarity index 100% rename from samplebrain/src/mfcc.cpp rename to brain/src/mfcc.cpp diff --git a/samplebrain/src/mfcc.h b/brain/src/mfcc.h similarity index 98% rename from samplebrain/src/mfcc.h rename to brain/src/mfcc.h index ab2a69b..03b2c4b 100644 --- a/samplebrain/src/mfcc.h +++ b/brain/src/mfcc.h @@ -20,7 +20,7 @@ #include "aquila/global.h" //#include "aquila/transform/FftFactory.h" -#include +#include #include #include diff --git a/samplebrain/src/pitchshift.cpp b/brain/src/pitchshift.cpp similarity index 100% rename from samplebrain/src/pitchshift.cpp rename to brain/src/pitchshift.cpp diff --git a/samplebrain/src/pitchshift.h b/brain/src/pitchshift.h similarity index 93% rename from samplebrain/src/pitchshift.h rename to brain/src/pitchshift.h index dd26883..3e2975a 100644 --- a/samplebrain/src/pitchshift.h +++ b/brain/src/pitchshift.h @@ -17,8 +17,8 @@ #ifndef SPIRALCORE_PITCHSHIFT #define SPIRALCORE_PITCHSHIFT -#include -#include +#include +#include #include namespace spiralcore { diff --git a/samplebrain/src/renderer.cpp b/brain/src/renderer.cpp similarity index 100% rename from samplebrain/src/renderer.cpp rename to brain/src/renderer.cpp diff --git a/samplebrain/src/renderer.h b/brain/src/renderer.h similarity index 99% rename from samplebrain/src/renderer.h rename to brain/src/renderer.h index 074cc0b..f3a27d4 100644 --- a/samplebrain/src/renderer.h +++ b/brain/src/renderer.h @@ -15,7 +15,7 @@ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include -#include +#include #include "brain.h" #include "block_stream.h" diff --git a/samplebrain/src/search_params.cpp b/brain/src/search_params.cpp similarity index 100% rename from samplebrain/src/search_params.cpp rename to brain/src/search_params.cpp diff --git a/samplebrain/src/search_params.h b/brain/src/search_params.h similarity index 95% rename from samplebrain/src/search_params.h rename to brain/src/search_params.h index 05e4e7b..c09f493 100644 --- a/samplebrain/src/search_params.h +++ b/brain/src/search_params.h @@ -17,8 +17,8 @@ #ifndef SEARCH_PARAMS #define SEARCH_PARAMS -#include "jellyfish/types.h" -#include "jellyfish/stream.h" +#include "spiralcore/types.h" +#include "spiralcore/stream.h" #include #pragma once diff --git a/samplebrain/src/jellyfish/OSC_server.cpp b/brain/src/spiralcore/OSC_server.cpp similarity index 100% rename from samplebrain/src/jellyfish/OSC_server.cpp rename to brain/src/spiralcore/OSC_server.cpp diff --git a/samplebrain/src/jellyfish/OSC_server.h b/brain/src/spiralcore/OSC_server.h similarity index 100% rename from samplebrain/src/jellyfish/OSC_server.h rename to brain/src/spiralcore/OSC_server.h diff --git a/samplebrain/src/jellyfish/allocator.cpp b/brain/src/spiralcore/allocator.cpp similarity index 100% rename from samplebrain/src/jellyfish/allocator.cpp rename to brain/src/spiralcore/allocator.cpp diff --git a/samplebrain/src/jellyfish/allocator.h b/brain/src/spiralcore/allocator.h similarity index 100% rename from samplebrain/src/jellyfish/allocator.h rename to brain/src/spiralcore/allocator.h diff --git a/samplebrain/src/jellyfish/audio.cpp b/brain/src/spiralcore/audio.cpp similarity index 87% rename from samplebrain/src/jellyfish/audio.cpp rename to brain/src/spiralcore/audio.cpp index c41aa05..754661e 100644 --- a/samplebrain/src/jellyfish/audio.cpp +++ b/brain/src/spiralcore/audio.cpp @@ -82,21 +82,5 @@ void audio_device::maybe_record() { } } -#ifndef DONT_USE_FLUXA_GRAPH -void run_graph(void *c, unsigned int size) { -#ifndef DONT_USE_FLUXA_GRAPH - audio_device *a=(audio_device *)c; - a->left_out.zero(); - a->right_out.zero(); - a->m_graph->process(size, a->left_out, a->right_out); - a->maybe_record(); -#endif -} -#endif - void audio_device::start_graph(graph *graph) { -#ifndef DONT_USE_FLUXA_GRAPH - m_graph = graph; - m_client.set_callback(run_graph,this); -#endif } diff --git a/samplebrain/src/jellyfish/audio.h b/brain/src/spiralcore/audio.h similarity index 100% rename from samplebrain/src/jellyfish/audio.h rename to brain/src/spiralcore/audio.h diff --git a/samplebrain/src/jellyfish/command_ring_buffer.cpp b/brain/src/spiralcore/command_ring_buffer.cpp similarity index 100% rename from samplebrain/src/jellyfish/command_ring_buffer.cpp rename to brain/src/spiralcore/command_ring_buffer.cpp diff --git a/samplebrain/src/jellyfish/command_ring_buffer.h b/brain/src/spiralcore/command_ring_buffer.h similarity index 100% rename from samplebrain/src/jellyfish/command_ring_buffer.h rename to brain/src/spiralcore/command_ring_buffer.h diff --git a/samplebrain/src/jellyfish/fixed.h b/brain/src/spiralcore/fixed.h similarity index 100% rename from samplebrain/src/jellyfish/fixed.h rename to brain/src/spiralcore/fixed.h diff --git a/samplebrain/src/jellyfish/portaudio_client.cpp b/brain/src/spiralcore/portaudio_client.cpp similarity index 100% rename from samplebrain/src/jellyfish/portaudio_client.cpp rename to brain/src/spiralcore/portaudio_client.cpp diff --git a/samplebrain/src/jellyfish/portaudio_client.h b/brain/src/spiralcore/portaudio_client.h similarity index 100% rename from samplebrain/src/jellyfish/portaudio_client.h rename to brain/src/spiralcore/portaudio_client.h diff --git a/samplebrain/src/jellyfish/ring_buffer.cpp b/brain/src/spiralcore/ring_buffer.cpp similarity index 100% rename from samplebrain/src/jellyfish/ring_buffer.cpp rename to brain/src/spiralcore/ring_buffer.cpp diff --git a/samplebrain/src/jellyfish/ring_buffer.h b/brain/src/spiralcore/ring_buffer.h similarity index 100% rename from samplebrain/src/jellyfish/ring_buffer.h rename to brain/src/spiralcore/ring_buffer.h diff --git a/samplebrain/src/jellyfish/sample.cpp b/brain/src/spiralcore/sample.cpp similarity index 100% rename from samplebrain/src/jellyfish/sample.cpp rename to brain/src/spiralcore/sample.cpp diff --git a/samplebrain/src/jellyfish/sample.h b/brain/src/spiralcore/sample.h similarity index 100% rename from samplebrain/src/jellyfish/sample.h rename to brain/src/spiralcore/sample.h diff --git a/samplebrain/src/jellyfish/stream.cpp b/brain/src/spiralcore/stream.cpp similarity index 100% rename from samplebrain/src/jellyfish/stream.cpp rename to brain/src/spiralcore/stream.cpp diff --git a/samplebrain/src/jellyfish/stream.h b/brain/src/spiralcore/stream.h similarity index 100% rename from samplebrain/src/jellyfish/stream.h rename to brain/src/spiralcore/stream.h diff --git a/samplebrain/src/jellyfish/types.h b/brain/src/spiralcore/types.h similarity index 100% rename from samplebrain/src/jellyfish/types.h rename to brain/src/spiralcore/types.h diff --git a/samplebrain/src/status.cpp b/brain/src/status.cpp similarity index 100% rename from samplebrain/src/status.cpp rename to brain/src/status.cpp diff --git a/samplebrain/src/status.h b/brain/src/status.h similarity index 100% rename from samplebrain/src/status.h rename to brain/src/status.h diff --git a/samplebrain/src/window.cpp b/brain/src/window.cpp similarity index 100% rename from samplebrain/src/window.cpp rename to brain/src/window.cpp diff --git a/samplebrain/src/window.h b/brain/src/window.h similarity index 95% rename from samplebrain/src/window.h rename to brain/src/window.h index bf9b495..7c5406f 100644 --- a/samplebrain/src/window.h +++ b/brain/src/window.h @@ -16,8 +16,8 @@ #include #include -#include "jellyfish/sample.h" -#include "jellyfish/types.h" +#include "spiralcore/sample.h" +#include "spiralcore/types.h" #ifndef WINDOW #define WINDOW diff --git a/samplebrain/test_data/100f32.wav b/brain/test_data/100f32.wav similarity index 100% rename from samplebrain/test_data/100f32.wav rename to brain/test_data/100f32.wav diff --git a/samplebrain/test_data/100i16.wav b/brain/test_data/100i16.wav similarity index 100% rename from samplebrain/test_data/100i16.wav rename to brain/test_data/100i16.wav diff --git a/samplebrain/test_data/noise.wav b/brain/test_data/noise.wav similarity index 100% rename from samplebrain/test_data/noise.wav rename to brain/test_data/noise.wav diff --git a/samplebrain/test_data/up.wav b/brain/test_data/up.wav similarity index 100% rename from samplebrain/test_data/up.wav rename to brain/test_data/up.wav diff --git a/cooking/mock/colour.png b/cooking/ideas/colour.png similarity index 100% rename from cooking/mock/colour.png rename to cooking/ideas/colour.png diff --git a/cooking/mock/drawing.svg b/cooking/ideas/drawing.svg similarity index 100% rename from cooking/mock/drawing.svg rename to cooking/ideas/drawing.svg diff --git a/cooking/mock/drawing2.svg b/cooking/ideas/drawing2.svg similarity index 100% rename from cooking/mock/drawing2.svg rename to cooking/ideas/drawing2.svg diff --git a/cooking/mock/monochrome.png b/cooking/ideas/monochrome.png similarity index 100% rename from cooking/mock/monochrome.png rename to cooking/ideas/monochrome.png diff --git a/cooking/mock/wav1.jpg b/cooking/ideas/wav1.jpg similarity index 100% rename from cooking/mock/wav1.jpg rename to cooking/ideas/wav1.jpg diff --git a/cooking/mock/wav1.png b/cooking/ideas/wav1.png similarity index 100% rename from cooking/mock/wav1.png rename to cooking/ideas/wav1.png diff --git a/cooking/mock/wav1.xcf b/cooking/ideas/wav1.xcf similarity index 100% rename from cooking/mock/wav1.xcf rename to cooking/ideas/wav1.xcf diff --git a/cooking/mock/wav2.jpg b/cooking/ideas/wav2.jpg similarity index 100% rename from cooking/mock/wav2.jpg rename to cooking/ideas/wav2.jpg diff --git a/cooking/mock/wav2.png b/cooking/ideas/wav2.png similarity index 100% rename from cooking/mock/wav2.png rename to cooking/ideas/wav2.png diff --git a/cooking/mock/wav3.jpg b/cooking/ideas/wav3.jpg similarity index 100% rename from cooking/mock/wav3.jpg rename to cooking/ideas/wav3.jpg diff --git a/cooking/mock/wav3.png b/cooking/ideas/wav3.png similarity index 100% rename from cooking/mock/wav3.png rename to cooking/ideas/wav3.png diff --git a/cooking/mock/wav4.jpg b/cooking/ideas/wav4.jpg similarity index 100% rename from cooking/mock/wav4.jpg rename to cooking/ideas/wav4.jpg diff --git a/cooking/mock/wav4.png b/cooking/ideas/wav4.png similarity index 100% rename from cooking/mock/wav4.png rename to cooking/ideas/wav4.png diff --git a/cooking/mock/wav5.jpg b/cooking/ideas/wav5.jpg similarity index 100% rename from cooking/mock/wav5.jpg rename to cooking/ideas/wav5.jpg diff --git a/cooking/mock/wav5.png b/cooking/ideas/wav5.png similarity index 100% rename from cooking/mock/wav5.png rename to cooking/ideas/wav5.png diff --git a/cooking/mock/wav6.jpg b/cooking/ideas/wav6.jpg similarity index 100% rename from cooking/mock/wav6.jpg rename to cooking/ideas/wav6.jpg diff --git a/cooking/mock/wav6.png b/cooking/ideas/wav6.png similarity index 100% rename from cooking/mock/wav6.png rename to cooking/ideas/wav6.png diff --git a/cooking/mock/wav7.jpg b/cooking/ideas/wav7.jpg similarity index 100% rename from cooking/mock/wav7.jpg rename to cooking/ideas/wav7.jpg diff --git a/cooking/mock/wav7.png b/cooking/ideas/wav7.png similarity index 100% rename from cooking/mock/wav7.png rename to cooking/ideas/wav7.png diff --git a/cooking/mock/wav7.xcf b/cooking/ideas/wav7.xcf similarity index 100% rename from cooking/mock/wav7.xcf rename to cooking/ideas/wav7.xcf diff --git a/cooking/mock/wav8.jpg b/cooking/ideas/wav8.jpg similarity index 100% rename from cooking/mock/wav8.jpg rename to cooking/ideas/wav8.jpg diff --git a/cooking/mock/wav8.png b/cooking/ideas/wav8.png similarity index 100% rename from cooking/mock/wav8.png rename to cooking/ideas/wav8.png diff --git a/cooking/mock/wav9.jpg b/cooking/ideas/wav9.jpg similarity index 100% rename from cooking/mock/wav9.jpg rename to cooking/ideas/wav9.jpg diff --git a/cooking/mock/wav9.png b/cooking/ideas/wav9.png similarity index 100% rename from cooking/mock/wav9.png rename to cooking/ideas/wav9.png diff --git a/python/_magicsquares.so b/cooking/python/_magicsquares.so similarity index 100% rename from python/_magicsquares.so rename to cooking/python/_magicsquares.so diff --git a/python/features/__init__.py b/cooking/python/features/__init__.py similarity index 100% rename from python/features/__init__.py rename to cooking/python/features/__init__.py diff --git a/python/features/__init__.pyc b/cooking/python/features/__init__.pyc similarity index 100% rename from python/features/__init__.pyc rename to cooking/python/features/__init__.pyc diff --git a/python/features/base.py b/cooking/python/features/base.py similarity index 100% rename from python/features/base.py rename to cooking/python/features/base.py diff --git a/python/features/base.pyc b/cooking/python/features/base.pyc similarity index 100% rename from python/features/base.pyc rename to cooking/python/features/base.pyc diff --git a/python/features/sigproc.py b/cooking/python/features/sigproc.py similarity index 100% rename from python/features/sigproc.py rename to cooking/python/features/sigproc.py diff --git a/python/features/sigproc.pyc b/cooking/python/features/sigproc.pyc similarity index 100% rename from python/features/sigproc.pyc rename to cooking/python/features/sigproc.pyc diff --git a/python/magicsquares.py b/cooking/python/magicsquares.py similarity index 100% rename from python/magicsquares.py rename to cooking/python/magicsquares.py diff --git a/python/magicsquares.pyc b/cooking/python/magicsquares.pyc similarity index 100% rename from python/magicsquares.pyc rename to cooking/python/magicsquares.pyc diff --git a/python/samplebrain b/cooking/python/samplebrain similarity index 100% rename from python/samplebrain rename to cooking/python/samplebrain diff --git a/python/transponge-eigen.py b/cooking/python/transponge-eigen.py similarity index 100% rename from python/transponge-eigen.py rename to cooking/python/transponge-eigen.py diff --git a/python/transponge-gui.py b/cooking/python/transponge-gui.py similarity index 100% rename from python/transponge-gui.py rename to cooking/python/transponge-gui.py diff --git a/python/transponge-mfcc.py b/cooking/python/transponge-mfcc.py similarity index 100% rename from python/transponge-mfcc.py rename to cooking/python/transponge-mfcc.py diff --git a/python/transponge.py b/cooking/python/transponge.py similarity index 100% rename from python/transponge.py rename to cooking/python/transponge.py diff --git a/sponge/.gitignore b/cooking/sponge/.gitignore similarity index 100% rename from sponge/.gitignore rename to cooking/sponge/.gitignore diff --git a/sponge/README b/cooking/sponge/README similarity index 100% rename from sponge/README rename to cooking/sponge/README diff --git a/sponge/images/icon.png b/cooking/sponge/images/icon.png similarity index 100% rename from sponge/images/icon.png rename to cooking/sponge/images/icon.png diff --git a/sponge/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.jar.md5 b/cooking/sponge/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.jar.md5 similarity index 100% rename from sponge/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.jar.md5 rename to cooking/sponge/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.jar.md5 diff --git a/sponge/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.jar.sha1 b/cooking/sponge/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.jar.sha1 similarity index 100% rename from sponge/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.jar.sha1 rename to cooking/sponge/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.jar.sha1 diff --git a/sponge/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.pom b/cooking/sponge/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.pom similarity index 100% rename from sponge/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.pom rename to cooking/sponge/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.pom diff --git a/sponge/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.pom.md5 b/cooking/sponge/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.pom.md5 similarity index 100% rename from sponge/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.pom.md5 rename to cooking/sponge/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.pom.md5 diff --git a/sponge/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.pom.sha1 b/cooking/sponge/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.pom.sha1 similarity index 100% rename from sponge/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.pom.sha1 rename to cooking/sponge/local_mvn_repo/local/comirva/0.0.36/comirva-0.0.36.pom.sha1 diff --git a/sponge/local_mvn_repo/local/comirva/0.36/comirva-0.36.jar.md5 b/cooking/sponge/local_mvn_repo/local/comirva/0.36/comirva-0.36.jar.md5 similarity index 100% rename from sponge/local_mvn_repo/local/comirva/0.36/comirva-0.36.jar.md5 rename to cooking/sponge/local_mvn_repo/local/comirva/0.36/comirva-0.36.jar.md5 diff --git a/sponge/local_mvn_repo/local/comirva/0.36/comirva-0.36.jar.sha1 b/cooking/sponge/local_mvn_repo/local/comirva/0.36/comirva-0.36.jar.sha1 similarity index 100% rename from sponge/local_mvn_repo/local/comirva/0.36/comirva-0.36.jar.sha1 rename to cooking/sponge/local_mvn_repo/local/comirva/0.36/comirva-0.36.jar.sha1 diff --git a/sponge/local_mvn_repo/local/comirva/0.36/comirva-0.36.pom b/cooking/sponge/local_mvn_repo/local/comirva/0.36/comirva-0.36.pom similarity index 100% rename from sponge/local_mvn_repo/local/comirva/0.36/comirva-0.36.pom rename to cooking/sponge/local_mvn_repo/local/comirva/0.36/comirva-0.36.pom diff --git a/sponge/local_mvn_repo/local/comirva/0.36/comirva-0.36.pom.md5 b/cooking/sponge/local_mvn_repo/local/comirva/0.36/comirva-0.36.pom.md5 similarity index 100% rename from sponge/local_mvn_repo/local/comirva/0.36/comirva-0.36.pom.md5 rename to cooking/sponge/local_mvn_repo/local/comirva/0.36/comirva-0.36.pom.md5 diff --git a/sponge/local_mvn_repo/local/comirva/0.36/comirva-0.36.pom.sha1 b/cooking/sponge/local_mvn_repo/local/comirva/0.36/comirva-0.36.pom.sha1 similarity index 100% rename from sponge/local_mvn_repo/local/comirva/0.36/comirva-0.36.pom.sha1 rename to cooking/sponge/local_mvn_repo/local/comirva/0.36/comirva-0.36.pom.sha1 diff --git a/sponge/local_mvn_repo/local/comirva/maven-metadata-local.xml b/cooking/sponge/local_mvn_repo/local/comirva/maven-metadata-local.xml similarity index 100% rename from sponge/local_mvn_repo/local/comirva/maven-metadata-local.xml rename to cooking/sponge/local_mvn_repo/local/comirva/maven-metadata-local.xml diff --git a/sponge/local_mvn_repo/local/comirva/maven-metadata-local.xml.md5 b/cooking/sponge/local_mvn_repo/local/comirva/maven-metadata-local.xml.md5 similarity index 100% rename from sponge/local_mvn_repo/local/comirva/maven-metadata-local.xml.md5 rename to cooking/sponge/local_mvn_repo/local/comirva/maven-metadata-local.xml.md5 diff --git a/sponge/local_mvn_repo/local/comirva/maven-metadata-local.xml.sha1 b/cooking/sponge/local_mvn_repo/local/comirva/maven-metadata-local.xml.sha1 similarity index 100% rename from sponge/local_mvn_repo/local/comirva/maven-metadata-local.xml.sha1 rename to cooking/sponge/local_mvn_repo/local/comirva/maven-metadata-local.xml.sha1 diff --git a/sponge/project.clj b/cooking/sponge/project.clj similarity index 100% rename from sponge/project.clj rename to cooking/sponge/project.clj diff --git a/sponge/src/app/aggregate.clj b/cooking/sponge/src/app/aggregate.clj similarity index 100% rename from sponge/src/app/aggregate.clj rename to cooking/sponge/src/app/aggregate.clj diff --git a/sponge/src/app/block.clj b/cooking/sponge/src/app/block.clj similarity index 100% rename from sponge/src/app/block.clj rename to cooking/sponge/src/app/block.clj diff --git a/sponge/src/app/blocklist.clj b/cooking/sponge/src/app/blocklist.clj similarity index 100% rename from sponge/src/app/blocklist.clj rename to cooking/sponge/src/app/blocklist.clj diff --git a/sponge/src/app/core.clj b/cooking/sponge/src/app/core.clj similarity index 100% rename from sponge/src/app/core.clj rename to cooking/sponge/src/app/core.clj diff --git a/sponge/src/app/listen.clj b/cooking/sponge/src/app/listen.clj similarity index 100% rename from sponge/src/app/listen.clj rename to cooking/sponge/src/app/listen.clj diff --git a/sponge/src/app/wav.clj b/cooking/sponge/src/app/wav.clj similarity index 100% rename from sponge/src/app/wav.clj rename to cooking/sponge/src/app/wav.clj diff --git a/sponge/test/app/test/aggregate.clj b/cooking/sponge/test/app/test/aggregate.clj similarity index 100% rename from sponge/test/app/test/aggregate.clj rename to cooking/sponge/test/app/test/aggregate.clj diff --git a/sponge/test/app/test/block.clj b/cooking/sponge/test/app/test/block.clj similarity index 100% rename from sponge/test/app/test/block.clj rename to cooking/sponge/test/app/test/block.clj diff --git a/sponge/test/app/test/blocklist.clj b/cooking/sponge/test/app/test/blocklist.clj similarity index 100% rename from sponge/test/app/test/blocklist.clj rename to cooking/sponge/test/app/test/blocklist.clj diff --git a/sponge/test/app/test/core.clj b/cooking/sponge/test/app/test/core.clj similarity index 100% rename from sponge/test/app/test/core.clj rename to cooking/sponge/test/app/test/core.clj diff --git a/sponge/test/app/test/listen.clj b/cooking/sponge/test/app/test/listen.clj similarity index 100% rename from sponge/test/app/test/listen.clj rename to cooking/sponge/test/app/test/listen.clj diff --git a/test.cpp b/cooking/test.cpp similarity index 100% rename from test.cpp rename to cooking/test.cpp diff --git a/samplebrain/qt/samplebrain.pro b/samplebrain/qt/samplebrain.pro deleted file mode 100644 index a1cb619..0000000 --- a/samplebrain/qt/samplebrain.pro +++ /dev/null @@ -1,50 +0,0 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Sun Jul 5 17:49:45 2015 -###################################################################### - -TEMPLATE = app -TARGET = samplebrain -DEPENDPATH += . 2 -INCLUDEPATH += . 2 - -QT += core gui widgets - -# Input -HEADERS += MainWindow.h \ - generated/ui_samplebrain.h \ - -SOURCES += MainWindow.cpp \ - sound_items.cpp \ - audio_thread.cpp \ - process_thread.cpp \ - feedback.cpp \ - qtmain.cpp \ - ../src/block.cpp \ - ../src/brain.cpp \ - ../src/fft.cpp \ - ../src/mfcc.cpp \ - ../src/renderer.cpp \ - ../src/search_params.cpp \ - ../src/status.cpp \ - ../src/window.cpp \ - ../src/block_stream.cpp \ - ../src/aquila/filter/MelFilterBank.cpp \ - ../src/aquila/filter/MelFilter.cpp \ - ../src/aquila/transform/Dct.cpp \ - ../src/jellyfish/sample.cpp \ - ../src/jellyfish/ring_buffer.cpp \ - ../src/jellyfish/command_ring_buffer.cpp \ - ../src/jellyfish/portaudio_client.cpp \ - ../src/jellyfish/audio.cpp \ - ../src/jellyfish/OSC_server.cpp \ - ../src/jellyfish/allocator.cpp \ - ../src/jellyfish/stream.cpp - -INCLUDEPATH += ../src -LIBS += -L.. -lportaudio -lfftw3 -lsndfile -llo -ldl -lpthread -lm -CONFIG+=debug - -QMAKE_CXXFLAGS += -Wall -Wno-unused -std=c++11 -DDONT_USE_FLUXA_GRAPH - -# assets -RESOURCES = samplebrain.qrc diff --git a/transponge-mfcc.py b/transponge-mfcc.py deleted file mode 100644 index f7da9c0..0000000 --- a/transponge-mfcc.py +++ /dev/null @@ -1,130 +0,0 @@ -import numpy as np -import scipy.io.wavfile -from features import mfcc -from features import logfbank -from features import base - - -def fadeinout(s,slength,elength): - for i in range(0,slength): - m = float(i)/slength; - s[i]*=m - for i in range(0,elength): - m = float(i)/elength; - s[(len(s)-1)-i]*=m - return s - -def normalise(s): - m = 0 - for i in range(0,len(s)): - if m0: - s/=float(m/10000.0) - return s - -def chop(wav,size,overlap): - ret = [] - pos = 0 - seg = [] - samples = wav[1] - while (pos+size