From 61f7b5f8e69785462a7761075c7192f3df254121 Mon Sep 17 00:00:00 2001 From: Chris Cannam Date: Mon, 4 Oct 2021 12:21:39 +0100 Subject: [PATCH] Update includes so they don't require include path to be set --- main/main.cpp | 2 +- src/audiocurves/CompoundAudioCurve.cpp | 2 +- src/audiocurves/CompoundAudioCurve.h | 3 +-- src/audiocurves/ConstantAudioCurve.h | 2 +- src/audiocurves/HighFrequencyAudioCurve.h | 2 +- src/audiocurves/PercussiveAudioCurve.cpp | 4 ++-- src/audiocurves/PercussiveAudioCurve.h | 2 +- src/audiocurves/SilentAudioCurve.h | 2 +- src/audiocurves/SpectralDifferenceAudioCurve.cpp | 4 ++-- src/audiocurves/SpectralDifferenceAudioCurve.h | 4 ++-- src/base/Profiler.cpp | 2 +- src/base/Profiler.h | 2 +- src/base/RingBuffer.h | 4 ++-- src/base/Scavenger.h | 6 +++--- src/dsp/AudioCurveCalculator.h | 3 +-- src/dsp/BQResampler.cpp | 4 ++-- src/dsp/BQResampler.h | 4 ++-- src/dsp/FFT.cpp | 10 +++++----- src/dsp/FFT.h | 2 +- src/dsp/MovingMedian.h | 2 +- src/dsp/Resampler.cpp | 4 ++-- src/dsp/Resampler.h | 2 +- src/dsp/SincWindow.h | 6 +++--- src/dsp/Window.h | 6 +++--- 24 files changed, 41 insertions(+), 43 deletions(-) diff --git a/main/main.cpp b/main/main.cpp index a47638c..eb25e4b 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -834,7 +834,7 @@ int main(int argc, char **argv) cerr << "elapsed time: " << sec << " sec, in frames/sec: " << countIn/sec << ", out frames/sec: " << countOut/sec << endl; } - RubberBand::Profiler::dump(); + Profiler::dump(); return 0; } diff --git a/src/audiocurves/CompoundAudioCurve.cpp b/src/audiocurves/CompoundAudioCurve.cpp index 122de96..45e6926 100644 --- a/src/audiocurves/CompoundAudioCurve.cpp +++ b/src/audiocurves/CompoundAudioCurve.cpp @@ -23,7 +23,7 @@ #include "CompoundAudioCurve.h" -#include "dsp/MovingMedian.h" +#include "../dsp/MovingMedian.h" #include diff --git a/src/audiocurves/CompoundAudioCurve.h b/src/audiocurves/CompoundAudioCurve.h index 123f8a6..0204aa2 100644 --- a/src/audiocurves/CompoundAudioCurve.h +++ b/src/audiocurves/CompoundAudioCurve.h @@ -24,10 +24,9 @@ #ifndef RUBBERBAND_COMPOUND_AUDIO_CURVE_H #define RUBBERBAND_COMPOUND_AUDIO_CURVE_H -#include "dsp/AudioCurveCalculator.h" #include "PercussiveAudioCurve.h" #include "HighFrequencyAudioCurve.h" -#include "dsp/SampleFilter.h" +#include "../dsp/SampleFilter.h" namespace RubberBand { diff --git a/src/audiocurves/ConstantAudioCurve.h b/src/audiocurves/ConstantAudioCurve.h index a97ac4e..63df9a4 100644 --- a/src/audiocurves/ConstantAudioCurve.h +++ b/src/audiocurves/ConstantAudioCurve.h @@ -24,7 +24,7 @@ #ifndef RUBBERBAND_CONSTANT_AUDIO_CURVE_H #define RUBBERBAND_CONSTANT_AUDIO_CURVE_H -#include "dsp/AudioCurveCalculator.h" +#include "../dsp/AudioCurveCalculator.h" namespace RubberBand { diff --git a/src/audiocurves/HighFrequencyAudioCurve.h b/src/audiocurves/HighFrequencyAudioCurve.h index 34db579..80fadd3 100644 --- a/src/audiocurves/HighFrequencyAudioCurve.h +++ b/src/audiocurves/HighFrequencyAudioCurve.h @@ -24,7 +24,7 @@ #ifndef RUBBERBAND_HIGHFREQUENCY_AUDIO_CURVE_H #define RUBBERBAND_HIGHFREQUENCY_AUDIO_CURVE_H -#include "dsp/AudioCurveCalculator.h" +#include "../dsp/AudioCurveCalculator.h" namespace RubberBand { diff --git a/src/audiocurves/PercussiveAudioCurve.cpp b/src/audiocurves/PercussiveAudioCurve.cpp index 8b63e34..50c3907 100644 --- a/src/audiocurves/PercussiveAudioCurve.cpp +++ b/src/audiocurves/PercussiveAudioCurve.cpp @@ -23,8 +23,8 @@ #include "PercussiveAudioCurve.h" -#include "system/Allocators.h" -#include "system/VectorOps.h" +#include "../system/Allocators.h" +#include "../system/VectorOps.h" #include #include diff --git a/src/audiocurves/PercussiveAudioCurve.h b/src/audiocurves/PercussiveAudioCurve.h index 645d1dd..593726f 100644 --- a/src/audiocurves/PercussiveAudioCurve.h +++ b/src/audiocurves/PercussiveAudioCurve.h @@ -24,7 +24,7 @@ #ifndef RUBBERBAND_PERCUSSIVE_AUDIO_CURVE_H #define RUBBERBAND_PERCUSSIVE_AUDIO_CURVE_H -#include "dsp/AudioCurveCalculator.h" +#include "../dsp/AudioCurveCalculator.h" namespace RubberBand { diff --git a/src/audiocurves/SilentAudioCurve.h b/src/audiocurves/SilentAudioCurve.h index 36b7984..501340c 100644 --- a/src/audiocurves/SilentAudioCurve.h +++ b/src/audiocurves/SilentAudioCurve.h @@ -24,7 +24,7 @@ #ifndef RUBBERBAND_SILENT_AUDIO_CURVE_H #define RUBBERBAND_SILENT_AUDIO_CURVE_H -#include "dsp/AudioCurveCalculator.h" +#include "../dsp/AudioCurveCalculator.h" namespace RubberBand { diff --git a/src/audiocurves/SpectralDifferenceAudioCurve.cpp b/src/audiocurves/SpectralDifferenceAudioCurve.cpp index 5579cc0..60f6e46 100644 --- a/src/audiocurves/SpectralDifferenceAudioCurve.cpp +++ b/src/audiocurves/SpectralDifferenceAudioCurve.cpp @@ -23,8 +23,8 @@ #include "SpectralDifferenceAudioCurve.h" -#include "system/Allocators.h" -#include "system/VectorOps.h" +#include "../system/Allocators.h" +#include "../system/VectorOps.h" namespace RubberBand { diff --git a/src/audiocurves/SpectralDifferenceAudioCurve.h b/src/audiocurves/SpectralDifferenceAudioCurve.h index 66b6133..7d79b79 100644 --- a/src/audiocurves/SpectralDifferenceAudioCurve.h +++ b/src/audiocurves/SpectralDifferenceAudioCurve.h @@ -24,8 +24,8 @@ #ifndef RUBBERBAND_SPECTRALDIFFERENCE_AUDIO_CURVE_H #define RUBBERBAND_SPECTRALDIFFERENCE_AUDIO_CURVE_H -#include "dsp/AudioCurveCalculator.h" -#include "dsp/Window.h" +#include "../dsp/AudioCurveCalculator.h" +#include "../dsp/Window.h" namespace RubberBand { diff --git a/src/base/Profiler.cpp b/src/base/Profiler.cpp index d96b571..a7ed6c2 100644 --- a/src/base/Profiler.cpp +++ b/src/base/Profiler.cpp @@ -23,7 +23,7 @@ #include "Profiler.h" -#include "system/Thread.h" +#include "../system/Thread.h" #include #include diff --git a/src/base/Profiler.h b/src/base/Profiler.h index bc39107..b9280cb 100644 --- a/src/base/Profiler.h +++ b/src/base/Profiler.h @@ -42,7 +42,7 @@ #ifdef PROFILE_CLOCKS #include #else -#include "system/sysutils.h" +#include "../system/sysutils.h" #ifndef _WIN32 #include #endif diff --git a/src/base/RingBuffer.h b/src/base/RingBuffer.h index cd9df19..152fc6b 100644 --- a/src/base/RingBuffer.h +++ b/src/base/RingBuffer.h @@ -28,8 +28,8 @@ //#define DEBUG_RINGBUFFER 1 -#include "system/sysutils.h" -#include "system/Allocators.h" +#include "../system/sysutils.h" +#include "../system/Allocators.h" #include diff --git a/src/base/Scavenger.h b/src/base/Scavenger.h index e8b6b5b..b6c045b 100644 --- a/src/base/Scavenger.h +++ b/src/base/Scavenger.h @@ -33,9 +33,9 @@ #include #endif -#include "system/Thread.h" -#include "system/sysutils.h" -#include "system/Allocators.h" +#include "../system/Thread.h" +#include "../system/sysutils.h" +#include "../system/Allocators.h" //#define DEBUG_SCAVENGER 1 diff --git a/src/dsp/AudioCurveCalculator.h b/src/dsp/AudioCurveCalculator.h index 0b47cd0..9b8dc61 100644 --- a/src/dsp/AudioCurveCalculator.h +++ b/src/dsp/AudioCurveCalculator.h @@ -26,8 +26,7 @@ #include - -#include "system/sysutils.h" +#include "../system/sysutils.h" namespace RubberBand { diff --git a/src/dsp/BQResampler.cpp b/src/dsp/BQResampler.cpp index 68323ae..c7db9c4 100644 --- a/src/dsp/BQResampler.cpp +++ b/src/dsp/BQResampler.cpp @@ -27,8 +27,8 @@ #include -#include "system/Allocators.h" -#include "system/VectorOps.h" +#include "../system/Allocators.h" +#include "../system/VectorOps.h" #define BQ_R__ R__ diff --git a/src/dsp/BQResampler.h b/src/dsp/BQResampler.h index 9ca0603..8a441f8 100644 --- a/src/dsp/BQResampler.h +++ b/src/dsp/BQResampler.h @@ -26,8 +26,8 @@ #include -#include "system/Allocators.h" -#include "system/VectorOps.h" +#include "../system/Allocators.h" +#include "../system/VectorOps.h" namespace RubberBand { diff --git a/src/dsp/FFT.cpp b/src/dsp/FFT.cpp index 5bfc3f7..57c33e6 100644 --- a/src/dsp/FFT.cpp +++ b/src/dsp/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 "../system/Thread.h" +#include "../base/Profiler.h" +#include "../system/Allocators.h" +#include "../system/VectorOps.h" +#include "../system/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/dsp/FFT.h index fbf36a0..42f619d 100644 --- a/src/dsp/FFT.h +++ b/src/dsp/FFT.h @@ -24,7 +24,7 @@ #ifndef RUBBERBAND_FFT_H #define RUBBERBAND_FFT_H -#include "system/sysutils.h" +#include "../system/sysutils.h" #include #include diff --git a/src/dsp/MovingMedian.h b/src/dsp/MovingMedian.h index 50b7eca..bd1b3ed 100644 --- a/src/dsp/MovingMedian.h +++ b/src/dsp/MovingMedian.h @@ -26,7 +26,7 @@ #include "SampleFilter.h" -#include "system/Allocators.h" +#include "../system/Allocators.h" #include diff --git a/src/dsp/Resampler.cpp b/src/dsp/Resampler.cpp index 13336f5..ecfe379 100644 --- a/src/dsp/Resampler.cpp +++ b/src/dsp/Resampler.cpp @@ -23,8 +23,8 @@ #include "Resampler.h" -#include "system/Allocators.h" -#include "system/VectorOps.h" +#include "../system/Allocators.h" +#include "../system/VectorOps.h" #include #include diff --git a/src/dsp/Resampler.h b/src/dsp/Resampler.h index bfed5cd..88a4b85 100644 --- a/src/dsp/Resampler.h +++ b/src/dsp/Resampler.h @@ -24,7 +24,7 @@ #ifndef RUBBERBAND_RESAMPLER_H #define RUBBERBAND_RESAMPLER_H -#include "system/sysutils.h" +#include "../system/sysutils.h" namespace RubberBand { diff --git a/src/dsp/SincWindow.h b/src/dsp/SincWindow.h index 43670ad..b9fe971 100644 --- a/src/dsp/SincWindow.h +++ b/src/dsp/SincWindow.h @@ -29,9 +29,9 @@ #include #include -#include "system/sysutils.h" -#include "system/VectorOps.h" -#include "system/Allocators.h" +#include "../system/sysutils.h" +#include "../system/VectorOps.h" +#include "../system/Allocators.h" namespace RubberBand { diff --git a/src/dsp/Window.h b/src/dsp/Window.h index 52893a9..52f356c 100644 --- a/src/dsp/Window.h +++ b/src/dsp/Window.h @@ -28,9 +28,9 @@ #include #include -#include "system/sysutils.h" -#include "system/VectorOps.h" -#include "system/Allocators.h" +#include "../system/sysutils.h" +#include "../system/VectorOps.h" +#include "../system/Allocators.h" namespace RubberBand {