Reorganise into faster (R2) and finer (R3)

ladspa-lv2/RubberBandPitchShifter.h

@@ -40,7 +40,7 @@
 #include <lv2.h>
 #endif
 
-#include "base/RingBuffer.h"
+#include "common/RingBuffer.h"
 
 namespace RubberBand {
 class RubberBandStretcher;

main/main.cpp

@@ -33,18 +33,17 @@
 
 #include <fstream>
 
-#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 <getopt.h>
 #include <unistd.h>
 #include <sys/time.h>
 #endif
 
-#include "../src/base/Profiler.h"
-
 #ifdef _WIN32
 using RubberBand::gettimeofday;
 #endif

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'

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 {

src/common/BQResampler.cpp

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

src/common/BQResampler.h

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

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

src/common/FFT.h

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

src/common/MovingMedian.h

@@ -25,11 +25,9 @@
 #define RUBBERBAND_MOVING_MEDIAN_H
 
 #include "SampleFilter.h"
-
-#include "../system/Allocators.h"
+#include "Allocators.h"
 
 #include <algorithm>
-
 #include <iostream>
 
 namespace RubberBand

src/common/Profiler.cpp

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

src/common/Profiler.h

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

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 <cstdlib>
 #include <cmath>

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 {
 

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 <iostream>
 

src/common/Scavenger.h

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

src/common/VectorOpsComplex.h

@@ -33,8 +33,6 @@ namespace RubberBand {
 template<typename T>
 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)) {

src/common/Window.h

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

src/common/sysutils.cpp

@@ -28,7 +28,6 @@
 #include <fcntl.h>
 #include <io.h>
 #else /* !_WIN32 */
-#include <signal.h>
 #include <unistd.h>
 #ifdef __APPLE__
 #include <sys/sysctl.h>
@@ -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()
 {

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);

src/faster/AudioCurveCalculator.h

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

src/faster/CompoundAudioCurve.cpp

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

src/faster/CompoundAudioCurve.h

@@ -26,7 +26,7 @@
 
 #include "PercussiveAudioCurve.h"
 #include "HighFrequencyAudioCurve.h"
-#include "../dsp/SampleFilter.h"
+#include "../common/SampleFilter.h"
 
 namespace RubberBand
 {

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
 {

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 <cmath>
 #include <iostream>

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
 {

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
 {

src/faster/SincWindow.h

@@ -29,9 +29,9 @@
 #include <cstdlib>
 #include <map>
 
-#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 {
 

src/faster/StretchCalculator.cpp

@@ -30,7 +30,7 @@
 #include <cassert>
 #include <algorithm>
 
-#include "system/sysutils.h"
+#include "../common/sysutils.h"
 
 namespace RubberBand
 {

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 <algorithm>
 

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 <cassert>
 #include <cmath>

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 <set>
 #include <algorithm>

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 <cassert>
 #include <cmath>

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 <vector>
 #include <memory>

src/finer/BinSegmenter.h

@@ -25,6 +25,7 @@
 #define RUBBERBAND_BIN_SEGMENTER_H
 
 #include "BinClassifier.h"
+
 #include <vector>
 
 namespace RubberBand {

src/finer/R3StretcherImpl.h

@@ -27,11 +27,11 @@
 #include <map>
 #include <memory>
 
-#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
 {

src/temporary.cpp

@@ -1 +1 @@
-#include "R3StretcherImpl.h"
+#include "finer/R3StretcherImpl.h"

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 <cmath>
 #include <cstdio>