6a6454c39540 — Chris Cannam 21 days ago
Update includes so they don't require include path to be set
M main/main.cpp +1 -1
@@ 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;
 }

          
M src/audiocurves/CompoundAudioCurve.cpp +1 -1
@@ 23,7 23,7 @@ 
 
 #include "CompoundAudioCurve.h"
 
-#include "dsp/MovingMedian.h"
+#include "../dsp/MovingMedian.h"
 
 #include <iostream>
 

          
M src/audiocurves/CompoundAudioCurve.h +1 -2
@@ 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
 {

          
M src/audiocurves/ConstantAudioCurve.h +1 -1
@@ 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
 {

          
M src/audiocurves/HighFrequencyAudioCurve.h +1 -1
@@ 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
 {

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

          
M src/audiocurves/PercussiveAudioCurve.h +1 -1
@@ 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
 {

          
M src/audiocurves/SilentAudioCurve.h +1 -1
@@ 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
 {

          
M src/audiocurves/SpectralDifferenceAudioCurve.cpp +2 -2
@@ 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
 {

          
M src/audiocurves/SpectralDifferenceAudioCurve.h +2 -2
@@ 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
 {

          
M src/base/Profiler.cpp +1 -1
@@ 23,7 23,7 @@ 
 
 #include "Profiler.h"
 
-#include "system/Thread.h"
+#include "../system/Thread.h"
 
 #include <algorithm>
 #include <set>

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

          
M src/base/RingBuffer.h +2 -2
@@ 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 <iostream>
 

          
M src/base/Scavenger.h +3 -3
@@ 33,9 33,9 @@ 
 #include <sys/time.h>
 #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
 

          
M src/dsp/AudioCurveCalculator.h +1 -2
@@ 26,8 26,7 @@ 
 
 #include <sys/types.h>
 
-
-#include "system/sysutils.h"
+#include "../system/sysutils.h"
 
 namespace RubberBand 
 {

          
M src/dsp/BQResampler.cpp +2 -2
@@ 27,8 27,8 @@ 
 
 #include <iostream>
 
-#include "system/Allocators.h"
-#include "system/VectorOps.h"
+#include "../system/Allocators.h"
+#include "../system/VectorOps.h"
 
 #define BQ_R__ R__
 

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

          
M src/dsp/FFT.cpp +5 -5
@@ 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

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

          
M src/dsp/MovingMedian.h +1 -1
@@ 26,7 26,7 @@ 
 
 #include "SampleFilter.h"
 
-#include "system/Allocators.h"
+#include "../system/Allocators.h"
 
 #include <algorithm>
 

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

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

          
M src/dsp/SincWindow.h +3 -3
@@ 29,9 29,9 @@ 
 #include <cstdlib>
 #include <map>
 
-#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 {
 

          
M src/dsp/Window.h +3 -3
@@ 28,9 28,9 @@ 
 #include <cstdlib>
 #include <map>
 
-#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 {