Update includes so they don't require include path to be set

This commit is contained in:
Chris Cannam
2021-10-04 12:21:39 +01:00
parent c8ff7c3b2b
commit 61f7b5f8e6
24 changed files with 41 additions and 43 deletions

View File

@@ -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; cerr << "elapsed time: " << sec << " sec, in frames/sec: " << countIn/sec << ", out frames/sec: " << countOut/sec << endl;
} }
RubberBand::Profiler::dump(); Profiler::dump();
return 0; return 0;
} }

View File

@@ -23,7 +23,7 @@
#include "CompoundAudioCurve.h" #include "CompoundAudioCurve.h"
#include "dsp/MovingMedian.h" #include "../dsp/MovingMedian.h"
#include <iostream> #include <iostream>

View File

@@ -24,10 +24,9 @@
#ifndef RUBBERBAND_COMPOUND_AUDIO_CURVE_H #ifndef RUBBERBAND_COMPOUND_AUDIO_CURVE_H
#define RUBBERBAND_COMPOUND_AUDIO_CURVE_H #define RUBBERBAND_COMPOUND_AUDIO_CURVE_H
#include "dsp/AudioCurveCalculator.h"
#include "PercussiveAudioCurve.h" #include "PercussiveAudioCurve.h"
#include "HighFrequencyAudioCurve.h" #include "HighFrequencyAudioCurve.h"
#include "dsp/SampleFilter.h" #include "../dsp/SampleFilter.h"
namespace RubberBand namespace RubberBand
{ {

View File

@@ -24,7 +24,7 @@
#ifndef RUBBERBAND_CONSTANT_AUDIO_CURVE_H #ifndef RUBBERBAND_CONSTANT_AUDIO_CURVE_H
#define RUBBERBAND_CONSTANT_AUDIO_CURVE_H #define RUBBERBAND_CONSTANT_AUDIO_CURVE_H
#include "dsp/AudioCurveCalculator.h" #include "../dsp/AudioCurveCalculator.h"
namespace RubberBand namespace RubberBand
{ {

View File

@@ -24,7 +24,7 @@
#ifndef RUBBERBAND_HIGHFREQUENCY_AUDIO_CURVE_H #ifndef RUBBERBAND_HIGHFREQUENCY_AUDIO_CURVE_H
#define RUBBERBAND_HIGHFREQUENCY_AUDIO_CURVE_H #define RUBBERBAND_HIGHFREQUENCY_AUDIO_CURVE_H
#include "dsp/AudioCurveCalculator.h" #include "../dsp/AudioCurveCalculator.h"
namespace RubberBand namespace RubberBand
{ {

View File

@@ -23,8 +23,8 @@
#include "PercussiveAudioCurve.h" #include "PercussiveAudioCurve.h"
#include "system/Allocators.h" #include "../system/Allocators.h"
#include "system/VectorOps.h" #include "../system/VectorOps.h"
#include <cmath> #include <cmath>
#include <iostream> #include <iostream>

View File

@@ -24,7 +24,7 @@
#ifndef RUBBERBAND_PERCUSSIVE_AUDIO_CURVE_H #ifndef RUBBERBAND_PERCUSSIVE_AUDIO_CURVE_H
#define RUBBERBAND_PERCUSSIVE_AUDIO_CURVE_H #define RUBBERBAND_PERCUSSIVE_AUDIO_CURVE_H
#include "dsp/AudioCurveCalculator.h" #include "../dsp/AudioCurveCalculator.h"
namespace RubberBand namespace RubberBand
{ {

View File

@@ -24,7 +24,7 @@
#ifndef RUBBERBAND_SILENT_AUDIO_CURVE_H #ifndef RUBBERBAND_SILENT_AUDIO_CURVE_H
#define RUBBERBAND_SILENT_AUDIO_CURVE_H #define RUBBERBAND_SILENT_AUDIO_CURVE_H
#include "dsp/AudioCurveCalculator.h" #include "../dsp/AudioCurveCalculator.h"
namespace RubberBand namespace RubberBand
{ {

View File

@@ -23,8 +23,8 @@
#include "SpectralDifferenceAudioCurve.h" #include "SpectralDifferenceAudioCurve.h"
#include "system/Allocators.h" #include "../system/Allocators.h"
#include "system/VectorOps.h" #include "../system/VectorOps.h"
namespace RubberBand namespace RubberBand
{ {

View File

@@ -24,8 +24,8 @@
#ifndef RUBBERBAND_SPECTRALDIFFERENCE_AUDIO_CURVE_H #ifndef RUBBERBAND_SPECTRALDIFFERENCE_AUDIO_CURVE_H
#define RUBBERBAND_SPECTRALDIFFERENCE_AUDIO_CURVE_H #define RUBBERBAND_SPECTRALDIFFERENCE_AUDIO_CURVE_H
#include "dsp/AudioCurveCalculator.h" #include "../dsp/AudioCurveCalculator.h"
#include "dsp/Window.h" #include "../dsp/Window.h"
namespace RubberBand namespace RubberBand
{ {

View File

@@ -23,7 +23,7 @@
#include "Profiler.h" #include "Profiler.h"
#include "system/Thread.h" #include "../system/Thread.h"
#include <algorithm> #include <algorithm>
#include <set> #include <set>

View File

@@ -42,7 +42,7 @@
#ifdef PROFILE_CLOCKS #ifdef PROFILE_CLOCKS
#include <time.h> #include <time.h>
#else #else
#include "system/sysutils.h" #include "../system/sysutils.h"
#ifndef _WIN32 #ifndef _WIN32
#include <sys/time.h> #include <sys/time.h>
#endif #endif

View File

@@ -28,8 +28,8 @@
//#define DEBUG_RINGBUFFER 1 //#define DEBUG_RINGBUFFER 1
#include "system/sysutils.h" #include "../system/sysutils.h"
#include "system/Allocators.h" #include "../system/Allocators.h"
#include <iostream> #include <iostream>

View File

@@ -33,9 +33,9 @@
#include <sys/time.h> #include <sys/time.h>
#endif #endif
#include "system/Thread.h" #include "../system/Thread.h"
#include "system/sysutils.h" #include "../system/sysutils.h"
#include "system/Allocators.h" #include "../system/Allocators.h"
//#define DEBUG_SCAVENGER 1 //#define DEBUG_SCAVENGER 1

View File

@@ -26,8 +26,7 @@
#include <sys/types.h> #include <sys/types.h>
#include "../system/sysutils.h"
#include "system/sysutils.h"
namespace RubberBand namespace RubberBand
{ {

View File

@@ -27,8 +27,8 @@
#include <iostream> #include <iostream>
#include "system/Allocators.h" #include "../system/Allocators.h"
#include "system/VectorOps.h" #include "../system/VectorOps.h"
#define BQ_R__ R__ #define BQ_R__ R__

View File

@@ -26,8 +26,8 @@
#include <vector> #include <vector>
#include "system/Allocators.h" #include "../system/Allocators.h"
#include "system/VectorOps.h" #include "../system/VectorOps.h"
namespace RubberBand { namespace RubberBand {

View File

@@ -22,11 +22,11 @@
*/ */
#include "FFT.h" #include "FFT.h"
#include "system/Thread.h" #include "../system/Thread.h"
#include "base/Profiler.h" #include "../base/Profiler.h"
#include "system/Allocators.h" #include "../system/Allocators.h"
#include "system/VectorOps.h" #include "../system/VectorOps.h"
#include "system/VectorOpsComplex.h" #include "../system/VectorOpsComplex.h"
// Define USE_FFTW_WISDOM if you are defining HAVE_FFTW3 and you want // Define USE_FFTW_WISDOM if you are defining HAVE_FFTW3 and you want
// to use FFTW_MEASURE mode with persistent wisdom files. This will // to use FFTW_MEASURE mode with persistent wisdom files. This will

View File

@@ -24,7 +24,7 @@
#ifndef RUBBERBAND_FFT_H #ifndef RUBBERBAND_FFT_H
#define RUBBERBAND_FFT_H #define RUBBERBAND_FFT_H
#include "system/sysutils.h" #include "../system/sysutils.h"
#include <string> #include <string>
#include <set> #include <set>

View File

@@ -26,7 +26,7 @@
#include "SampleFilter.h" #include "SampleFilter.h"
#include "system/Allocators.h" #include "../system/Allocators.h"
#include <algorithm> #include <algorithm>

View File

@@ -23,8 +23,8 @@
#include "Resampler.h" #include "Resampler.h"
#include "system/Allocators.h" #include "../system/Allocators.h"
#include "system/VectorOps.h" #include "../system/VectorOps.h"
#include <cstdlib> #include <cstdlib>
#include <cmath> #include <cmath>

View File

@@ -24,7 +24,7 @@
#ifndef RUBBERBAND_RESAMPLER_H #ifndef RUBBERBAND_RESAMPLER_H
#define RUBBERBAND_RESAMPLER_H #define RUBBERBAND_RESAMPLER_H
#include "system/sysutils.h" #include "../system/sysutils.h"
namespace RubberBand { namespace RubberBand {

View File

@@ -29,9 +29,9 @@
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include "system/sysutils.h" #include "../system/sysutils.h"
#include "system/VectorOps.h" #include "../system/VectorOps.h"
#include "system/Allocators.h" #include "../system/Allocators.h"
namespace RubberBand { namespace RubberBand {

View File

@@ -28,9 +28,9 @@
#include <cstdlib> #include <cstdlib>
#include <map> #include <map>
#include "system/sysutils.h" #include "../system/sysutils.h"
#include "system/VectorOps.h" #include "../system/VectorOps.h"
#include "system/Allocators.h" #include "../system/Allocators.h"
namespace RubberBand { namespace RubberBand {