Merge from default branch

README.md

@@ -24,8 +24,10 @@ CI builds:
 
 ## Licence
 
-Rubber Band is distributed under the GNU General Public License. See
+Rubber Band Library is distributed under the GNU General Public
-the file COPYING for more information.
+License (GPL). You can redistribute it and/or modify it under the
+terms of the GPL; either version 2 of the License, or (at your option)
+any later version. See the file COPYING for more information.
 
 If you wish to distribute code using the Rubber Band Library under
 terms other than those of the GNU General Public License, you must

ladspa/RubberBandPitchShifter.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _RUBBERBAND_PITCH_SHIFTER_H_
+#ifndef RUBBERBAND_PITCH_SHIFTER_H
-#define _RUBBERBAND_PITCH_SHIFTER_H_
+#define RUBBERBAND_PITCH_SHIFTER_H
 
 #include <ladspa.h>
 

rubberband/RubberBandStretcher.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _RUBBERBANDSTRETCHER_H_
+#ifndef RUBBERBAND_STRETCHER_H
-#define _RUBBERBANDSTRETCHER_H_
+#define RUBBERBAND_STRETCHER_H
     
 #define RUBBERBAND_VERSION "1.9.0"
 #define RUBBERBAND_API_MAJOR_VERSION 2

rubberband/rubberband-c.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _RUBBERBAND_C_API_H_
+#ifndef RUBBERBAND_C_API_H
-#define _RUBBERBAND_C_API_H_
+#define RUBBERBAND_C_API_H
 
 #ifdef __cplusplus
 extern "C" {

src/StretchCalculator.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _RUBBERBAND_STRETCH_CALCULATOR_H_
+#ifndef RUBBERBAND_STRETCH_CALCULATOR_H
-#define _RUBBERBAND_STRETCH_CALCULATOR_H_
+#define RUBBERBAND_STRETCH_CALCULATOR_H
 
 #include <sys/types.h>
 

src/StretcherChannelData.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _RUBBERBAND_STRETCHERCHANNELDATA_H_
+#ifndef RUBBERBAND_STRETCHERCHANNELDATA_H
-#define _RUBBERBAND_STRETCHERCHANNELDATA_H_
+#define RUBBERBAND_STRETCHERCHANNELDATA_H
 
 #include "StretcherImpl.h"
 

src/StretcherImpl.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _RUBBERBAND_STRETCHERIMPL_H_
+#ifndef RUBBERBAND_STRETCHERIMPL_H
-#define _RUBBERBAND_STRETCHERIMPL_H_
+#define RUBBERBAND_STRETCHERIMPL_H
 
 #include "rubberband/RubberBandStretcher.h"
 

src/audiocurves/CompoundAudioCurve.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _COMPOUND_AUDIO_CURVE_H_
+#ifndef RUBBERBAND_COMPOUND_AUDIO_CURVE_H
-#define _COMPOUND_AUDIO_CURVE_H_
+#define RUBBERBAND_COMPOUND_AUDIO_CURVE_H
 
 #include "dsp/AudioCurveCalculator.h"
 #include "PercussiveAudioCurve.h"

src/audiocurves/ConstantAudioCurve.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _CONSTANT_AUDIO_CURVE_H_
+#ifndef RUBBERBAND_CONSTANT_AUDIO_CURVE_H
-#define _CONSTANT_AUDIO_CURVE_H_
+#define RUBBERBAND_CONSTANT_AUDIO_CURVE_H
 
 #include "dsp/AudioCurveCalculator.h"
 

src/audiocurves/HighFrequencyAudioCurve.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _HIGHFREQUENCY_AUDIO_CURVE_H_
+#ifndef RUBBERBAND_HIGHFREQUENCY_AUDIO_CURVE_H
-#define _HIGHFREQUENCY_AUDIO_CURVE_H_
+#define RUBBERBAND_HIGHFREQUENCY_AUDIO_CURVE_H
 
 #include "dsp/AudioCurveCalculator.h"
 

src/audiocurves/PercussiveAudioCurve.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _PERCUSSIVE_AUDIO_CURVE_H_
+#ifndef RUBBERBAND_PERCUSSIVE_AUDIO_CURVE_H
-#define _PERCUSSIVE_AUDIO_CURVE_H_
+#define RUBBERBAND_PERCUSSIVE_AUDIO_CURVE_H
 
 #include "dsp/AudioCurveCalculator.h"
 

src/audiocurves/SilentAudioCurve.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _SILENT_AUDIO_CURVE_H_
+#ifndef RUBBERBAND_SILENT_AUDIO_CURVE_H
-#define _SILENT_AUDIO_CURVE_H_
+#define RUBBERBAND_SILENT_AUDIO_CURVE_H
 
 #include "dsp/AudioCurveCalculator.h"
 

src/audiocurves/SpectralDifferenceAudioCurve.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _SPECTRALDIFFERENCE_AUDIO_CURVE_H_
+#ifndef RUBBERBAND_SPECTRALDIFFERENCE_AUDIO_CURVE_H
-#define _SPECTRALDIFFERENCE_AUDIO_CURVE_H_
+#define RUBBERBAND_SPECTRALDIFFERENCE_AUDIO_CURVE_H
 
 #include "dsp/AudioCurveCalculator.h"
 #include "dsp/Window.h"

src/base/Profiler.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _PROFILER_H_
+#ifndef RUBBERBAND_PROFILER_H
-#define _PROFILER_H_
+#define RUBBERBAND_PROFILER_H
 
 //#define NO_TIMING 1
 //#define WANT_TIMING 1

src/base/RingBuffer.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _RUBBERBAND_RINGBUFFER_H_
+#ifndef RUBBERBAND_RINGBUFFER_H
-#define _RUBBERBAND_RINGBUFFER_H_
+#define RUBBERBAND_RINGBUFFER_H
 
 #include <sys/types.h>
 
@@ -524,4 +524,4 @@ RingBuffer<T>::zero(int n)
 
 }
 
-#endif // _RINGBUFFER_H_
+#endif // _RINGBUFFER_H

src/base/Scavenger.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _RUBBERBAND_SCAVENGER_H_
+#ifndef RUBBERBAND_SCAVENGER_H
-#define _RUBBERBAND_SCAVENGER_H_
+#define RUBBERBAND_SCAVENGER_H
 
 #include <vector>
 #include <list>

src/dsp/AudioCurveCalculator.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _AUDIO_CURVE_CALCULATOR_H_
+#ifndef RUBBERBAND_AUDIO_CURVE_CALCULATOR_H
-#define _AUDIO_CURVE_CALCULATOR_H_
+#define RUBBERBAND_AUDIO_CURVE_CALCULATOR_H
 
 #include <sys/types.h>
 

src/dsp/FFT.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _RUBBERBAND_FFT_H_
+#ifndef RUBBERBAND_FFT_H
-#define _RUBBERBAND_FFT_H_
+#define RUBBERBAND_FFT_H
 
 #include "system/sysutils.h"
 

src/dsp/MovingMedian.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _MOVING_MEDIAN_H_
+#ifndef RUBBERBAND_MOVING_MEDIAN_H
-#define _MOVING_MEDIAN_H_
+#define RUBBERBAND_MOVING_MEDIAN_H
 
 #include "SampleFilter.h"
 

src/dsp/SampleFilter.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _SAMPLE_FILTER_H_
+#ifndef RUBBERBAND_SAMPLE_FILTER_H
-#define _SAMPLE_FILTER_H_
+#define RUBBERBAND_SAMPLE_FILTER_H
 
 #include <cassert>
 

src/dsp/SincWindow.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _RUBBERBAND_SINC_WINDOW_H_
+#ifndef RUBBERBAND_SINC_WINDOW_H
-#define _RUBBERBAND_SINC_WINDOW_H_
+#define RUBBERBAND_SINC_WINDOW_H
 
 #include <cmath>
 #include <iostream>

src/dsp/Window.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _RUBBERBAND_WINDOW_H_
+#ifndef RUBBERBAND_WINDOW_H
-#define _RUBBERBAND_WINDOW_H_
+#define RUBBERBAND_WINDOW_H
 
 #include <cmath>
 #include <cstdlib>

src/pommier/sse_mathfun.h

@@ -1,6 +1,6 @@
 
-#ifndef _POMMIER_SSE_MATHFUN_H_
+#ifndef POMMIER_SSE_MATHFUN_H
-#define _POMMIER_SSE_MATHFUN_H_
+#define POMMIER_SSE_MATHFUN_H
 
 /* SIMD (SSE1+MMX or SSE2) implementation of sin, cos, exp and log
 

src/system/Thread.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _RUBBERBAND_THREAD_H_
+#ifndef RUBBERBAND_THREAD_H
-#define _RUBBERBAND_THREAD_H_
+#define RUBBERBAND_THREAD_H
 
 #include <string>
 

src/system/VectorOps.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _RUBBERBAND_VECTOR_OPS_H_
+#ifndef RUBBERBAND_VECTOR_OPS_H
-#define _RUBBERBAND_VECTOR_OPS_H_
+#define RUBBERBAND_VECTOR_OPS_H
 
 #ifdef HAVE_IPP
 #ifndef _MSC_VER

src/system/VectorOpsComplex.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _RUBBERBAND_VECTOR_OPS_COMPLEX_H_
+#ifndef RUBBERBAND_VECTOR_OPS_COMPLEX_H
-#define _RUBBERBAND_VECTOR_OPS_COMPLEX_H_
+#define RUBBERBAND_VECTOR_OPS_COMPLEX_H
 
 #include "VectorOps.h"
 

src/system/sysutils.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _RUBBERBAND_SYSUTILS_H_
+#ifndef RUBBERBAND_SYSUTILS_H
-#define _RUBBERBAND_SYSUTILS_H_
+#define RUBBERBAND_SYSUTILS_H
 
 #ifdef _MSC_VER
 #  if _MSC_VER < 1800

vamp/RubberBandVampPlugin.h

@@ -21,8 +21,8 @@
     you must obtain a valid commercial licence before doing so.
 */
 
-#ifndef _RUBBERBAND_VAMP_PLUGIN_H_
+#ifndef RUBBERBAND_VAMP_PLUGIN_H
-#define _RUBBERBAND_VAMP_PLUGIN_H_
+#define RUBBERBAND_VAMP_PLUGIN_H
 
 #include <vamp-sdk/Plugin.h>