From e9ad04e2b48bf09fe4a91c666d263ec9c97cc8d9 Mon Sep 17 00:00:00 2001 From: Chris Cannam Date: Thu, 19 May 2022 13:34:51 +0100 Subject: [PATCH] Reorganise into faster (R2) and finer (R3) --- ladspa-lv2/RubberBandPitchShifter.h | 2 +- main/main.cpp | 7 ++-- meson.build | 32 +++++++++---------- src/RubberBandStretcher.cpp | 2 +- src/{system => common}/Allocators.cpp | 0 src/{system => common}/Allocators.h | 0 src/{dsp => common}/BQResampler.cpp | 4 +-- src/{dsp => common}/BQResampler.h | 4 +-- src/{dsp => common}/FFT.cpp | 10 +++--- src/{dsp => common}/FFT.h | 2 +- src/{dsp => common}/MovingMedian.h | 4 +-- src/{base => common}/Profiler.cpp | 2 +- src/{base => common}/Profiler.h | 2 +- src/{dsp => common}/Resampler.cpp | 4 +-- src/{dsp => common}/Resampler.h | 2 +- src/{base => common}/RingBuffer.h | 4 +-- src/{dsp => common}/SampleFilter.h | 0 src/{base => common}/Scavenger.h | 6 ++-- src/{system => common}/Thread.cpp | 0 src/{system => common}/Thread.h | 0 src/{system => common}/VectorOps.h | 0 src/{system => common}/VectorOpsComplex.cpp | 0 src/{system => common}/VectorOpsComplex.h | 2 -- src/{dsp => common}/Window.h | 6 ++-- src/{system => common}/sysutils.cpp | 26 --------------- src/{system => common}/sysutils.h | 3 -- src/{ => ext}/float_cast/float_cast.h | 0 src/{ => ext}/getopt/getopt.c | 0 src/{ => ext}/getopt/getopt.h | 0 src/{ => ext}/getopt/getopt_long.c | 0 src/{ => ext}/kissfft/COPYING | 0 src/{ => ext}/kissfft/_kiss_fft_guts.h | 0 src/{ => ext}/kissfft/kiss_fft.c | 0 src/{ => ext}/kissfft/kiss_fft.h | 0 src/{ => ext}/kissfft/kiss_fft_log.h | 0 src/{ => ext}/kissfft/kiss_fftr.c | 0 src/{ => ext}/kissfft/kiss_fftr.h | 0 src/{ => ext}/pommier/neon_mathfun.h | 0 src/{ => ext}/pommier/sse_mathfun.h | 0 src/{ => ext}/speex/COPYING | 0 src/{ => ext}/speex/resample.c | 0 src/{ => ext}/speex/speex_resampler.h | 0 src/{dsp => faster}/AudioCurveCalculator.cpp | 0 src/{dsp => faster}/AudioCurveCalculator.h | 2 +- .../CompoundAudioCurve.cpp | 2 +- .../CompoundAudioCurve.h | 2 +- .../HighFrequencyAudioCurve.cpp | 0 .../HighFrequencyAudioCurve.h | 2 +- .../PercussiveAudioCurve.cpp | 4 +-- .../PercussiveAudioCurve.h | 2 +- .../SilentAudioCurve.cpp | 0 .../SilentAudioCurve.h | 2 +- src/{dsp => faster}/SincWindow.h | 6 ++-- src/{ => faster}/StretchCalculator.cpp | 2 +- src/{ => faster}/StretchCalculator.h | 0 src/{ => faster}/StretcherChannelData.cpp | 5 ++- src/{ => faster}/StretcherChannelData.h | 0 src/{ => faster}/StretcherImpl.cpp | 17 ++++------ src/{ => faster}/StretcherImpl.h | 17 +++++----- src/{ => faster}/StretcherProcess.cpp | 8 ++--- src/{dsp => finer}/BinClassifier.h | 6 ++-- src/{dsp => finer}/BinSegmenter.h | 1 + src/{dsp => finer}/Peak.h | 0 src/{ => finer}/R3StretcherImpl.h | 8 ++--- src/temporary.cpp | 2 +- vamp/RubberBandVampPlugin.cpp | 4 +-- 66 files changed, 89 insertions(+), 127 deletions(-) rename src/{system => common}/Allocators.cpp (100%) rename src/{system => common}/Allocators.h (100%) rename src/{dsp => common}/BQResampler.cpp (99%) rename src/{dsp => common}/BQResampler.h (98%) rename src/{dsp => common}/FFT.cpp (99%) rename src/{dsp => common}/FFT.h (99%) rename src/{dsp => common}/MovingMedian.h (99%) rename src/{base => common}/Profiler.cpp (99%) rename src/{base => common}/Profiler.h (98%) rename src/{dsp => common}/Resampler.cpp (99%) rename src/{dsp => common}/Resampler.h (99%) rename src/{base => common}/RingBuffer.h (99%) rename src/{dsp => common}/SampleFilter.h (100%) rename src/{base => common}/Scavenger.h (98%) rename src/{system => common}/Thread.cpp (100%) rename src/{system => common}/Thread.h (100%) rename src/{system => common}/VectorOps.h (100%) rename src/{system => common}/VectorOpsComplex.cpp (100%) rename src/{system => common}/VectorOpsComplex.h (98%) rename src/{dsp => common}/Window.h (97%) rename src/{system => common}/sysutils.cpp (90%) rename src/{system => common}/sysutils.h (96%) rename src/{ => ext}/float_cast/float_cast.h (100%) rename src/{ => ext}/getopt/getopt.c (100%) rename src/{ => ext}/getopt/getopt.h (100%) rename src/{ => ext}/getopt/getopt_long.c (100%) rename src/{ => ext}/kissfft/COPYING (100%) rename src/{ => ext}/kissfft/_kiss_fft_guts.h (100%) rename src/{ => ext}/kissfft/kiss_fft.c (100%) rename src/{ => ext}/kissfft/kiss_fft.h (100%) rename src/{ => ext}/kissfft/kiss_fft_log.h (100%) rename src/{ => ext}/kissfft/kiss_fftr.c (100%) rename src/{ => ext}/kissfft/kiss_fftr.h (100%) rename src/{ => ext}/pommier/neon_mathfun.h (100%) rename src/{ => ext}/pommier/sse_mathfun.h (100%) rename src/{ => ext}/speex/COPYING (100%) rename src/{ => ext}/speex/resample.c (100%) rename src/{ => ext}/speex/speex_resampler.h (100%) rename src/{dsp => faster}/AudioCurveCalculator.cpp (100%) rename src/{dsp => faster}/AudioCurveCalculator.h (99%) rename src/{audiocurves => faster}/CompoundAudioCurve.cpp (99%) rename src/{audiocurves => faster}/CompoundAudioCurve.h (98%) rename src/{audiocurves => faster}/HighFrequencyAudioCurve.cpp (100%) rename src/{audiocurves => faster}/HighFrequencyAudioCurve.h (97%) rename src/{audiocurves => faster}/PercussiveAudioCurve.cpp (97%) rename src/{audiocurves => faster}/PercussiveAudioCurve.h (97%) rename src/{audiocurves => faster}/SilentAudioCurve.cpp (100%) rename src/{audiocurves => faster}/SilentAudioCurve.h (97%) rename src/{dsp => faster}/SincWindow.h (97%) rename src/{ => faster}/StretchCalculator.cpp (99%) rename src/{ => faster}/StretchCalculator.h (100%) rename src/{ => faster}/StretcherChannelData.cpp (99%) rename src/{ => faster}/StretcherChannelData.h (100%) rename src/{ => faster}/StretcherImpl.cpp (99%) rename src/{ => faster}/StretcherImpl.h (96%) rename src/{ => faster}/StretcherProcess.cpp (99%) rename src/{dsp => finer}/BinClassifier.h (97%) rename src/{dsp => finer}/BinSegmenter.h (99%) rename src/{dsp => finer}/Peak.h (100%) rename src/{ => finer}/R3StretcherImpl.h (97%) diff --git a/ladspa-lv2/RubberBandPitchShifter.h b/ladspa-lv2/RubberBandPitchShifter.h index 15678e1..7b3a83d 100644 --- a/ladspa-lv2/RubberBandPitchShifter.h +++ b/ladspa-lv2/RubberBandPitchShifter.h @@ -40,7 +40,7 @@ #include #endif -#include "base/RingBuffer.h" +#include "common/RingBuffer.h" namespace RubberBand { class RubberBandStretcher; diff --git a/main/main.cpp b/main/main.cpp index 90f75dc..25e66ac 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -33,18 +33,17 @@ #include -#include "../src/system/sysutils.h" +#include "../src/common/sysutils.h" +#include "../src/common/Profiler.h" #ifdef _MSC_VER -#include "../src/getopt/getopt.h" +#include "../src/ext/getopt/getopt.h" #else #include #include #include #endif -#include "../src/base/Profiler.h" - #ifdef _WIN32 using RubberBand::gettimeofday; #endif diff --git a/meson.build b/meson.build index 4a6dc38..0a1dfae 100644 --- a/meson.build +++ b/meson.build @@ -33,21 +33,21 @@ public_headers = [ library_sources = [ 'src/rubberband-c.cpp', 'src/RubberBandStretcher.cpp', - 'src/StretcherProcess.cpp', - 'src/StretchCalculator.cpp', - 'src/base/Profiler.cpp', - 'src/dsp/AudioCurveCalculator.cpp', - 'src/audiocurves/CompoundAudioCurve.cpp', - 'src/audiocurves/HighFrequencyAudioCurve.cpp', - 'src/audiocurves/SilentAudioCurve.cpp', - 'src/audiocurves/PercussiveAudioCurve.cpp', - 'src/dsp/Resampler.cpp', - 'src/dsp/FFT.cpp', - 'src/system/Allocators.cpp', - 'src/system/sysutils.cpp', - 'src/system/Thread.cpp', - 'src/StretcherChannelData.cpp', - 'src/StretcherImpl.cpp', + 'src/faster/AudioCurveCalculator.cpp', + 'src/faster/CompoundAudioCurve.cpp', + 'src/faster/HighFrequencyAudioCurve.cpp', + 'src/faster/SilentAudioCurve.cpp', + 'src/faster/PercussiveAudioCurve.cpp', + 'src/faster/StretchCalculator.cpp', + 'src/faster/StretcherChannelData.cpp', + 'src/faster/StretcherImpl.cpp', + 'src/faster/StretcherProcess.cpp', + 'src/common/Profiler.cpp', + 'src/common/Resampler.cpp', + 'src/common/FFT.cpp', + 'src/common/Allocators.cpp', + 'src/common/sysutils.cpp', + 'src/common/Thread.cpp', 'src/temporary.cpp', ] @@ -203,7 +203,7 @@ if resampler == 'builtin' if samplerate_dep.found() message('(to use libsamplerate instead, reconfigure with -Dresampler=libsamplerate)') endif - library_sources += 'src/dsp/BQResampler.cpp' + library_sources += 'src/common/BQResampler.cpp' feature_defines += ['-DUSE_BQRESAMPLER'] elif resampler == 'libsamplerate' diff --git a/src/RubberBandStretcher.cpp b/src/RubberBandStretcher.cpp index 394cc03..5791a94 100644 --- a/src/RubberBandStretcher.cpp +++ b/src/RubberBandStretcher.cpp @@ -21,7 +21,7 @@ you must obtain a valid commercial licence before doing so. */ -#include "StretcherImpl.h" +#include "faster/StretcherImpl.h" namespace RubberBand { diff --git a/src/system/Allocators.cpp b/src/common/Allocators.cpp similarity index 100% rename from src/system/Allocators.cpp rename to src/common/Allocators.cpp diff --git a/src/system/Allocators.h b/src/common/Allocators.h similarity index 100% rename from src/system/Allocators.h rename to src/common/Allocators.h diff --git a/src/dsp/BQResampler.cpp b/src/common/BQResampler.cpp similarity index 99% rename from src/dsp/BQResampler.cpp rename to src/common/BQResampler.cpp index f426013..2ac5f50 100644 --- a/src/dsp/BQResampler.cpp +++ b/src/common/BQResampler.cpp @@ -28,8 +28,8 @@ #include #include -#include "../system/Allocators.h" -#include "../system/VectorOps.h" +#include "Allocators.h" +#include "VectorOps.h" #define BQ_R__ R__ diff --git a/src/dsp/BQResampler.h b/src/common/BQResampler.h similarity index 98% rename from src/dsp/BQResampler.h rename to src/common/BQResampler.h index 3b11203..4858096 100644 --- a/src/dsp/BQResampler.h +++ b/src/common/BQResampler.h @@ -26,8 +26,8 @@ #include -#include "../system/Allocators.h" -#include "../system/VectorOps.h" +#include "Allocators.h" +#include "VectorOps.h" namespace RubberBand { diff --git a/src/dsp/FFT.cpp b/src/common/FFT.cpp similarity index 99% rename from src/dsp/FFT.cpp rename to src/common/FFT.cpp index 2ae40de..984901f 100644 --- a/src/dsp/FFT.cpp +++ b/src/common/FFT.cpp @@ -22,11 +22,11 @@ */ #include "FFT.h" -#include "../system/Thread.h" -#include "../base/Profiler.h" -#include "../system/Allocators.h" -#include "../system/VectorOps.h" -#include "../system/VectorOpsComplex.h" +#include "Thread.h" +#include "Profiler.h" +#include "Allocators.h" +#include "VectorOps.h" +#include "VectorOpsComplex.h" // Define USE_FFTW_WISDOM if you are defining HAVE_FFTW3 and you want // to use FFTW_MEASURE mode with persistent wisdom files. This will diff --git a/src/dsp/FFT.h b/src/common/FFT.h similarity index 99% rename from src/dsp/FFT.h rename to src/common/FFT.h index 73b094e..54c8ad0 100644 --- a/src/dsp/FFT.h +++ b/src/common/FFT.h @@ -24,7 +24,7 @@ #ifndef RUBBERBAND_FFT_H #define RUBBERBAND_FFT_H -#include "../system/sysutils.h" +#include "sysutils.h" #include #include diff --git a/src/dsp/MovingMedian.h b/src/common/MovingMedian.h similarity index 99% rename from src/dsp/MovingMedian.h rename to src/common/MovingMedian.h index 12b144d..c12b18e 100644 --- a/src/dsp/MovingMedian.h +++ b/src/common/MovingMedian.h @@ -25,11 +25,9 @@ #define RUBBERBAND_MOVING_MEDIAN_H #include "SampleFilter.h" - -#include "../system/Allocators.h" +#include "Allocators.h" #include - #include namespace RubberBand diff --git a/src/base/Profiler.cpp b/src/common/Profiler.cpp similarity index 99% rename from src/base/Profiler.cpp rename to src/common/Profiler.cpp index 3d32e3e..a606cfa 100644 --- a/src/base/Profiler.cpp +++ b/src/common/Profiler.cpp @@ -23,7 +23,7 @@ #include "Profiler.h" -#include "../system/Thread.h" +#include "Thread.h" #include #include diff --git a/src/base/Profiler.h b/src/common/Profiler.h similarity index 98% rename from src/base/Profiler.h rename to src/common/Profiler.h index e9e3f56..37ec04c 100644 --- a/src/base/Profiler.h +++ b/src/common/Profiler.h @@ -42,7 +42,7 @@ #ifdef PROFILE_CLOCKS #include #else -#include "../system/sysutils.h" +#include "sysutils.h" #ifndef _WIN32 #include #endif diff --git a/src/dsp/Resampler.cpp b/src/common/Resampler.cpp similarity index 99% rename from src/dsp/Resampler.cpp rename to src/common/Resampler.cpp index 155daaa..83ba0df 100644 --- a/src/dsp/Resampler.cpp +++ b/src/common/Resampler.cpp @@ -23,8 +23,8 @@ #include "Resampler.h" -#include "../system/Allocators.h" -#include "../system/VectorOps.h" +#include "Allocators.h" +#include "VectorOps.h" #include #include diff --git a/src/dsp/Resampler.h b/src/common/Resampler.h similarity index 99% rename from src/dsp/Resampler.h rename to src/common/Resampler.h index 94abef3..142ce58 100644 --- a/src/dsp/Resampler.h +++ b/src/common/Resampler.h @@ -24,7 +24,7 @@ #ifndef RUBBERBAND_RESAMPLER_H #define RUBBERBAND_RESAMPLER_H -#include "../system/sysutils.h" +#include "sysutils.h" namespace RubberBand { diff --git a/src/base/RingBuffer.h b/src/common/RingBuffer.h similarity index 99% rename from src/base/RingBuffer.h rename to src/common/RingBuffer.h index 9bb91e0..fb80788 100644 --- a/src/base/RingBuffer.h +++ b/src/common/RingBuffer.h @@ -28,8 +28,8 @@ //#define DEBUG_RINGBUFFER 1 -#include "../system/sysutils.h" -#include "../system/Allocators.h" +#include "sysutils.h" +#include "Allocators.h" #include diff --git a/src/dsp/SampleFilter.h b/src/common/SampleFilter.h similarity index 100% rename from src/dsp/SampleFilter.h rename to src/common/SampleFilter.h diff --git a/src/base/Scavenger.h b/src/common/Scavenger.h similarity index 98% rename from src/base/Scavenger.h rename to src/common/Scavenger.h index b270371..e404314 100644 --- a/src/base/Scavenger.h +++ b/src/common/Scavenger.h @@ -33,9 +33,9 @@ #include #endif -#include "../system/Thread.h" -#include "../system/sysutils.h" -#include "../system/Allocators.h" +#include "Thread.h" +#include "sysutils.h" +#include "Allocators.h" //#define DEBUG_SCAVENGER 1 diff --git a/src/system/Thread.cpp b/src/common/Thread.cpp similarity index 100% rename from src/system/Thread.cpp rename to src/common/Thread.cpp diff --git a/src/system/Thread.h b/src/common/Thread.h similarity index 100% rename from src/system/Thread.h rename to src/common/Thread.h diff --git a/src/system/VectorOps.h b/src/common/VectorOps.h similarity index 100% rename from src/system/VectorOps.h rename to src/common/VectorOps.h diff --git a/src/system/VectorOpsComplex.cpp b/src/common/VectorOpsComplex.cpp similarity index 100% rename from src/system/VectorOpsComplex.cpp rename to src/common/VectorOpsComplex.cpp diff --git a/src/system/VectorOpsComplex.h b/src/common/VectorOpsComplex.h similarity index 98% rename from src/system/VectorOpsComplex.h rename to src/common/VectorOpsComplex.h index 782afa2..1229a77 100644 --- a/src/system/VectorOpsComplex.h +++ b/src/common/VectorOpsComplex.h @@ -33,8 +33,6 @@ namespace RubberBand { template inline void c_phasor(T *real, T *imag, T phase) { - //!!! IPP contains ippsSinCos_xxx in ippvm.h -- these are - //!!! fixed-accuracy, test and compare #if defined HAVE_VDSP int one = 1; if (sizeof(T) == sizeof(float)) { diff --git a/src/dsp/Window.h b/src/common/Window.h similarity index 97% rename from src/dsp/Window.h rename to src/common/Window.h index bfd947a..e4d6a05 100644 --- a/src/dsp/Window.h +++ b/src/common/Window.h @@ -28,9 +28,9 @@ #include #include -#include "../system/sysutils.h" -#include "../system/VectorOps.h" -#include "../system/Allocators.h" +#include "sysutils.h" +#include "VectorOps.h" +#include "Allocators.h" namespace RubberBand { diff --git a/src/system/sysutils.cpp b/src/common/sysutils.cpp similarity index 90% rename from src/system/sysutils.cpp rename to src/common/sysutils.cpp index 8ae09d8..819767a 100644 --- a/src/system/sysutils.cpp +++ b/src/common/sysutils.cpp @@ -28,7 +28,6 @@ #include #include #else /* !_WIN32 */ -#include #include #ifdef __APPLE__ #include @@ -209,31 +208,6 @@ void system_specific_application_initialise() { } - -ProcessStatus -system_get_process_status(int pid) -{ -#ifdef _WIN32 - HANDLE handle = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid); - if (!handle) { - return ProcessNotRunning; - } else { - CloseHandle(handle); - return ProcessRunning; - } -#else - if (kill(getpid(), 0) == 0) { - if (kill(pid, 0) == 0) { - return ProcessRunning; - } else { - return ProcessNotRunning; - } - } else { - return UnknownProcessStatus; - } -#endif -} - #ifdef _WIN32 void system_memorybarrier() { diff --git a/src/system/sysutils.h b/src/common/sysutils.h similarity index 96% rename from src/system/sysutils.h rename to src/common/sysutils.h index a6271cd..adf9aba 100644 --- a/src/system/sysutils.h +++ b/src/common/sysutils.h @@ -87,9 +87,6 @@ extern bool system_is_multiprocessor(); extern void system_specific_initialise(); extern void system_specific_application_initialise(); -enum ProcessStatus { ProcessRunning, ProcessNotRunning, UnknownProcessStatus }; -extern ProcessStatus system_get_process_status(int pid); - #ifdef _WIN32 struct timeval { long tv_sec; long tv_usec; }; void gettimeofday(struct timeval *p, void *tz); diff --git a/src/float_cast/float_cast.h b/src/ext/float_cast/float_cast.h similarity index 100% rename from src/float_cast/float_cast.h rename to src/ext/float_cast/float_cast.h diff --git a/src/getopt/getopt.c b/src/ext/getopt/getopt.c similarity index 100% rename from src/getopt/getopt.c rename to src/ext/getopt/getopt.c diff --git a/src/getopt/getopt.h b/src/ext/getopt/getopt.h similarity index 100% rename from src/getopt/getopt.h rename to src/ext/getopt/getopt.h diff --git a/src/getopt/getopt_long.c b/src/ext/getopt/getopt_long.c similarity index 100% rename from src/getopt/getopt_long.c rename to src/ext/getopt/getopt_long.c diff --git a/src/kissfft/COPYING b/src/ext/kissfft/COPYING similarity index 100% rename from src/kissfft/COPYING rename to src/ext/kissfft/COPYING diff --git a/src/kissfft/_kiss_fft_guts.h b/src/ext/kissfft/_kiss_fft_guts.h similarity index 100% rename from src/kissfft/_kiss_fft_guts.h rename to src/ext/kissfft/_kiss_fft_guts.h diff --git a/src/kissfft/kiss_fft.c b/src/ext/kissfft/kiss_fft.c similarity index 100% rename from src/kissfft/kiss_fft.c rename to src/ext/kissfft/kiss_fft.c diff --git a/src/kissfft/kiss_fft.h b/src/ext/kissfft/kiss_fft.h similarity index 100% rename from src/kissfft/kiss_fft.h rename to src/ext/kissfft/kiss_fft.h diff --git a/src/kissfft/kiss_fft_log.h b/src/ext/kissfft/kiss_fft_log.h similarity index 100% rename from src/kissfft/kiss_fft_log.h rename to src/ext/kissfft/kiss_fft_log.h diff --git a/src/kissfft/kiss_fftr.c b/src/ext/kissfft/kiss_fftr.c similarity index 100% rename from src/kissfft/kiss_fftr.c rename to src/ext/kissfft/kiss_fftr.c diff --git a/src/kissfft/kiss_fftr.h b/src/ext/kissfft/kiss_fftr.h similarity index 100% rename from src/kissfft/kiss_fftr.h rename to src/ext/kissfft/kiss_fftr.h diff --git a/src/pommier/neon_mathfun.h b/src/ext/pommier/neon_mathfun.h similarity index 100% rename from src/pommier/neon_mathfun.h rename to src/ext/pommier/neon_mathfun.h diff --git a/src/pommier/sse_mathfun.h b/src/ext/pommier/sse_mathfun.h similarity index 100% rename from src/pommier/sse_mathfun.h rename to src/ext/pommier/sse_mathfun.h diff --git a/src/speex/COPYING b/src/ext/speex/COPYING similarity index 100% rename from src/speex/COPYING rename to src/ext/speex/COPYING diff --git a/src/speex/resample.c b/src/ext/speex/resample.c similarity index 100% rename from src/speex/resample.c rename to src/ext/speex/resample.c diff --git a/src/speex/speex_resampler.h b/src/ext/speex/speex_resampler.h similarity index 100% rename from src/speex/speex_resampler.h rename to src/ext/speex/speex_resampler.h diff --git a/src/dsp/AudioCurveCalculator.cpp b/src/faster/AudioCurveCalculator.cpp similarity index 100% rename from src/dsp/AudioCurveCalculator.cpp rename to src/faster/AudioCurveCalculator.cpp diff --git a/src/dsp/AudioCurveCalculator.h b/src/faster/AudioCurveCalculator.h similarity index 99% rename from src/dsp/AudioCurveCalculator.h rename to src/faster/AudioCurveCalculator.h index 0af1c9a..90c77b6 100644 --- a/src/dsp/AudioCurveCalculator.h +++ b/src/faster/AudioCurveCalculator.h @@ -26,7 +26,7 @@ #include -#include "../system/sysutils.h" +#include "../common/sysutils.h" namespace RubberBand { diff --git a/src/audiocurves/CompoundAudioCurve.cpp b/src/faster/CompoundAudioCurve.cpp similarity index 99% rename from src/audiocurves/CompoundAudioCurve.cpp rename to src/faster/CompoundAudioCurve.cpp index 509a8c2..14cf8d8 100644 --- a/src/audiocurves/CompoundAudioCurve.cpp +++ b/src/faster/CompoundAudioCurve.cpp @@ -23,7 +23,7 @@ #include "CompoundAudioCurve.h" -#include "../dsp/MovingMedian.h" +#include "../common/MovingMedian.h" #include diff --git a/src/audiocurves/CompoundAudioCurve.h b/src/faster/CompoundAudioCurve.h similarity index 98% rename from src/audiocurves/CompoundAudioCurve.h rename to src/faster/CompoundAudioCurve.h index 74bb3bd..6e5cfbb 100644 --- a/src/audiocurves/CompoundAudioCurve.h +++ b/src/faster/CompoundAudioCurve.h @@ -26,7 +26,7 @@ #include "PercussiveAudioCurve.h" #include "HighFrequencyAudioCurve.h" -#include "../dsp/SampleFilter.h" +#include "../common/SampleFilter.h" namespace RubberBand { diff --git a/src/audiocurves/HighFrequencyAudioCurve.cpp b/src/faster/HighFrequencyAudioCurve.cpp similarity index 100% rename from src/audiocurves/HighFrequencyAudioCurve.cpp rename to src/faster/HighFrequencyAudioCurve.cpp diff --git a/src/audiocurves/HighFrequencyAudioCurve.h b/src/faster/HighFrequencyAudioCurve.h similarity index 97% rename from src/audiocurves/HighFrequencyAudioCurve.h rename to src/faster/HighFrequencyAudioCurve.h index a071817..43bed56 100644 --- a/src/audiocurves/HighFrequencyAudioCurve.h +++ b/src/faster/HighFrequencyAudioCurve.h @@ -24,7 +24,7 @@ #ifndef RUBBERBAND_HIGHFREQUENCY_AUDIO_CURVE_H #define RUBBERBAND_HIGHFREQUENCY_AUDIO_CURVE_H -#include "../dsp/AudioCurveCalculator.h" +#include "AudioCurveCalculator.h" namespace RubberBand { diff --git a/src/audiocurves/PercussiveAudioCurve.cpp b/src/faster/PercussiveAudioCurve.cpp similarity index 97% rename from src/audiocurves/PercussiveAudioCurve.cpp rename to src/faster/PercussiveAudioCurve.cpp index 02db7c6..afea381 100644 --- a/src/audiocurves/PercussiveAudioCurve.cpp +++ b/src/faster/PercussiveAudioCurve.cpp @@ -23,8 +23,8 @@ #include "PercussiveAudioCurve.h" -#include "../system/Allocators.h" -#include "../system/VectorOps.h" +#include "../common/Allocators.h" +#include "../common/VectorOps.h" #include #include diff --git a/src/audiocurves/PercussiveAudioCurve.h b/src/faster/PercussiveAudioCurve.h similarity index 97% rename from src/audiocurves/PercussiveAudioCurve.h rename to src/faster/PercussiveAudioCurve.h index e2be7da..4aa90a2 100644 --- a/src/audiocurves/PercussiveAudioCurve.h +++ b/src/faster/PercussiveAudioCurve.h @@ -24,7 +24,7 @@ #ifndef RUBBERBAND_PERCUSSIVE_AUDIO_CURVE_H #define RUBBERBAND_PERCUSSIVE_AUDIO_CURVE_H -#include "../dsp/AudioCurveCalculator.h" +#include "AudioCurveCalculator.h" namespace RubberBand { diff --git a/src/audiocurves/SilentAudioCurve.cpp b/src/faster/SilentAudioCurve.cpp similarity index 100% rename from src/audiocurves/SilentAudioCurve.cpp rename to src/faster/SilentAudioCurve.cpp diff --git a/src/audiocurves/SilentAudioCurve.h b/src/faster/SilentAudioCurve.h similarity index 97% rename from src/audiocurves/SilentAudioCurve.h rename to src/faster/SilentAudioCurve.h index b2cf090..69bab67 100644 --- a/src/audiocurves/SilentAudioCurve.h +++ b/src/faster/SilentAudioCurve.h @@ -24,7 +24,7 @@ #ifndef RUBBERBAND_SILENT_AUDIO_CURVE_H #define RUBBERBAND_SILENT_AUDIO_CURVE_H -#include "../dsp/AudioCurveCalculator.h" +#include "AudioCurveCalculator.h" namespace RubberBand { diff --git a/src/dsp/SincWindow.h b/src/faster/SincWindow.h similarity index 97% rename from src/dsp/SincWindow.h rename to src/faster/SincWindow.h index 6381f9d..b0441c0 100644 --- a/src/dsp/SincWindow.h +++ b/src/faster/SincWindow.h @@ -29,9 +29,9 @@ #include #include -#include "../system/sysutils.h" -#include "../system/VectorOps.h" -#include "../system/Allocators.h" +#include "../common/sysutils.h" +#include "../common/VectorOps.h" +#include "../common/Allocators.h" namespace RubberBand { diff --git a/src/StretchCalculator.cpp b/src/faster/StretchCalculator.cpp similarity index 99% rename from src/StretchCalculator.cpp rename to src/faster/StretchCalculator.cpp index da228a3..87580e8 100644 --- a/src/StretchCalculator.cpp +++ b/src/faster/StretchCalculator.cpp @@ -30,7 +30,7 @@ #include #include -#include "system/sysutils.h" +#include "../common/sysutils.h" namespace RubberBand { diff --git a/src/StretchCalculator.h b/src/faster/StretchCalculator.h similarity index 100% rename from src/StretchCalculator.h rename to src/faster/StretchCalculator.h diff --git a/src/StretcherChannelData.cpp b/src/faster/StretcherChannelData.cpp similarity index 99% rename from src/StretcherChannelData.cpp rename to src/faster/StretcherChannelData.cpp index 1c555dc..3d379c6 100644 --- a/src/StretcherChannelData.cpp +++ b/src/faster/StretcherChannelData.cpp @@ -23,9 +23,8 @@ #include "StretcherChannelData.h" -#include "dsp/Resampler.h" - -#include "system/Allocators.h" +#include "../common/Resampler.h" +#include "../common/Allocators.h" #include diff --git a/src/StretcherChannelData.h b/src/faster/StretcherChannelData.h similarity index 100% rename from src/StretcherChannelData.h rename to src/faster/StretcherChannelData.h diff --git a/src/StretcherImpl.cpp b/src/faster/StretcherImpl.cpp similarity index 99% rename from src/StretcherImpl.cpp rename to src/faster/StretcherImpl.cpp index 97c43c8..a23ebbc 100644 --- a/src/StretcherImpl.cpp +++ b/src/faster/StretcherImpl.cpp @@ -23,19 +23,16 @@ #include "StretcherImpl.h" -#include "audiocurves/PercussiveAudioCurve.h" -#include "audiocurves/HighFrequencyAudioCurve.h" -#include "audiocurves/SilentAudioCurve.h" -#include "audiocurves/CompoundAudioCurve.h" - -#include "dsp/Resampler.h" - +#include "PercussiveAudioCurve.h" +#include "HighFrequencyAudioCurve.h" +#include "SilentAudioCurve.h" +#include "CompoundAudioCurve.h" #include "StretchCalculator.h" #include "StretcherChannelData.h" -#include "base/Profiler.h" - -#include "system/sysutils.h" +#include "../common/Resampler.h" +#include "../common/Profiler.h" +#include "../common/sysutils.h" #include #include diff --git a/src/StretcherImpl.h b/src/faster/StretcherImpl.h similarity index 96% rename from src/StretcherImpl.h rename to src/faster/StretcherImpl.h index 6485e6e..bcd0abd 100644 --- a/src/StretcherImpl.h +++ b/src/faster/StretcherImpl.h @@ -26,16 +26,15 @@ #include "../rubberband/RubberBandStretcher.h" -#include "dsp/Window.h" -#include "dsp/SincWindow.h" -#include "dsp/FFT.h" +#include "../common/Window.h" +#include "../common/FFT.h" +#include "../common/RingBuffer.h" +#include "../common/Scavenger.h" +#include "../common/Thread.h" +#include "../common/sysutils.h" -#include "audiocurves/CompoundAudioCurve.h" - -#include "base/RingBuffer.h" -#include "base/Scavenger.h" -#include "system/Thread.h" -#include "system/sysutils.h" +#include "SincWindow.h" +#include "CompoundAudioCurve.h" #include #include diff --git a/src/StretcherProcess.cpp b/src/faster/StretcherProcess.cpp similarity index 99% rename from src/StretcherProcess.cpp rename to src/faster/StretcherProcess.cpp index 78365b3..cb79b2a 100644 --- a/src/StretcherProcess.cpp +++ b/src/faster/StretcherProcess.cpp @@ -25,10 +25,10 @@ #include "StretchCalculator.h" #include "StretcherChannelData.h" -#include "dsp/Resampler.h" -#include "base/Profiler.h" -#include "system/VectorOps.h" -#include "system/sysutils.h" +#include "../common/Resampler.h" +#include "../common/Profiler.h" +#include "../common/VectorOps.h" +#include "../common/sysutils.h" #include #include diff --git a/src/dsp/BinClassifier.h b/src/finer/BinClassifier.h similarity index 97% rename from src/dsp/BinClassifier.h rename to src/finer/BinClassifier.h index 59e17fd..a92b009 100644 --- a/src/dsp/BinClassifier.h +++ b/src/finer/BinClassifier.h @@ -24,9 +24,9 @@ #ifndef RUBBERBAND_BIN_CLASSIFIER_H #define RUBBERBAND_BIN_CLASSIFIER_H -#include "../system/Allocators.h" -#include "../dsp/MovingMedian.h" -#include "../base/RingBuffer.h" +#include "../common/Allocators.h" +#include "../common/MovingMedian.h" +#include "../common/RingBuffer.h" #include #include diff --git a/src/dsp/BinSegmenter.h b/src/finer/BinSegmenter.h similarity index 99% rename from src/dsp/BinSegmenter.h rename to src/finer/BinSegmenter.h index dd3b4ea..8bb78d4 100644 --- a/src/dsp/BinSegmenter.h +++ b/src/finer/BinSegmenter.h @@ -25,6 +25,7 @@ #define RUBBERBAND_BIN_SEGMENTER_H #include "BinClassifier.h" + #include namespace RubberBand { diff --git a/src/dsp/Peak.h b/src/finer/Peak.h similarity index 100% rename from src/dsp/Peak.h rename to src/finer/Peak.h diff --git a/src/R3StretcherImpl.h b/src/finer/R3StretcherImpl.h similarity index 97% rename from src/R3StretcherImpl.h rename to src/finer/R3StretcherImpl.h index 075808c..8eb21b5 100644 --- a/src/R3StretcherImpl.h +++ b/src/finer/R3StretcherImpl.h @@ -27,11 +27,11 @@ #include #include -#include "dsp/BinSegmenter.h" -#include "dsp/FFT.h" -#include "system/Allocators.h" +#include "BinSegmenter.h" +#include "Peak.h" -#include "dsp/Peak.h" +#include "../common/FFT.h" +#include "../common/Allocators.h" namespace RubberBand { diff --git a/src/temporary.cpp b/src/temporary.cpp index 75cf924..39d8493 100644 --- a/src/temporary.cpp +++ b/src/temporary.cpp @@ -1 +1 @@ -#include "R3StretcherImpl.h" +#include "finer/R3StretcherImpl.h" diff --git a/vamp/RubberBandVampPlugin.cpp b/vamp/RubberBandVampPlugin.cpp index 00f2840..a3dbd6c 100644 --- a/vamp/RubberBandVampPlugin.cpp +++ b/vamp/RubberBandVampPlugin.cpp @@ -23,8 +23,8 @@ #include "RubberBandVampPlugin.h" -#include "StretchCalculator.h" -#include "system/sysutils.h" +#include "faster/StretchCalculator.h" +#include "common/sysutils.h" #include #include