Merge branch 'master' of https://gitlab.com/soundtouch/soundtouch

source/Android-lib/README-SoundTouch-Android.html

@@ -45,7 +45,7 @@
     open Cygwin/bash shell, go to directory <b>&quot;soundtouch/source/Android-lib/jni&quot;</b> and invoke the NDK 
     compiler with following command:</p>
 <pre>    $NDK/ndk-build</pre>
-<p>This will build binaries for all the supported Android platforms (arm-v5, arm-v7, X86, MIPS etc) of SoundTouch library, plus the JNI wrapper interface as discussed below. The target binaries will be built into the &quot;libs&quot; subdirectory. As long as all these .so binary library versions are included in the APK Application delivery package, the targer Android device can choose the correct library version to use. </p>
+<p>This will build binaries for all the supported Android platforms (arm-v5, arm-v7, X86, MIPS etc) of SoundTouch library, plus the JNI wrapper interface as discussed below. The target binaries will be built into the &quot;libs&quot; subdirectory. As long as all these .so binary library versions are included in the APK Application delivery package, the target Android device can choose the correct library version to use. </p>
 <p>Notice that to allow Cygwin/bash to locate the NDK compile scripts, you 
     need to define the location of the NDK installation defined in environment 
     variable &quot;NDK&quot;. That's easiest done by adding the NDK path definition at end of 

source/SoundStretch/Makefile.am

@@ -27,7 +27,7 @@ bin_PROGRAMS=soundstretch
 noinst_HEADERS=RunParameters.h WavFile.h
 
 # extra files to include in distribution tarball
-EXTRA_DIST=soundstretch.dsp soundstretch.dsw soundstretch.sln soundstretch.vcproj
+EXTRA_DIST=soundstretch.sln soundstretch.vcxproj
 
 ## for every name listed under bin_PROGRAMS, you have a <prog>_SOURCES. This lists
 ## all the sources in the current directory that are used to build soundstretch.

source/SoundTouch/BPMDetect.cpp

@@ -430,7 +430,7 @@ void BPMDetect::inputSamples(const SAMPLETYPE *samples, int numSamples)
         buffer->putSamples(decimated, decSamples);
     }
 
-    // when the buffer has enought samples for processing...
+    // when the buffer has enough samples for processing...
     int req = max(windowLen + XCORR_UPDATE_SEQUENCE, 2 * XCORR_UPDATE_SEQUENCE);
     while ((int)buffer->numSamples() >= req) 
     {

source/SoundTouch/InterpolateLinear.h

@@ -38,7 +38,7 @@
 namespace soundtouch
 {
 
-/// Linear transposer class that uses integer arithmetics
+/// Linear transposer class that uses integer arithmetic
 class InterpolateLinearInteger : public TransposerBase
 {
 protected:
@@ -63,7 +63,7 @@ public:
 };
 
 
-/// Linear transposer class that uses floating point arithmetics
+/// Linear transposer class that uses floating point arithmetic
 class InterpolateLinearFloat : public TransposerBase
 {
 protected:

source/SoundTouch/Makefile.am

@@ -20,9 +20,10 @@ include $(top_srcdir)/config/am_include.mk
 
 
 # set to something if you want other stuff to be included in the distribution tarball
-EXTRA_DIST=SoundTouch.dsp SoundTouch.dsw SoundTouch.sln SoundTouch.vcproj
+EXTRA_DIST=SoundTouch.sln SoundTouch.vcxproj
 
-noinst_HEADERS=AAFilter.h cpu_detect.h cpu_detect_x86.cpp FIRFilter.h RateTransposer.h TDStretch.h PeakFinder.h
+noinst_HEADERS=AAFilter.h cpu_detect.h cpu_detect_x86.cpp FIRFilter.h RateTransposer.h TDStretch.h PeakFinder.h \
+    InterpolateCubic.h InterpolateLinear.h InterpolateShannon.h
 
 lib_LTLIBRARIES=libSoundTouch.la
 #

source/SoundTouch/PeakFinder.h

@@ -44,8 +44,8 @@ protected:
 
     /// Calculates the mass center between given vector items.
     double calcMassCenter(const float *data, ///< Data vector.
-                         int firstPos,      ///< Index of first vector item beloging to the peak.
-                         int lastPos        ///< Index of last vector item beloging to the peak.
+                         int firstPos,      ///< Index of first vector item belonging to the peak.
+                         int lastPos        ///< Index of last vector item belonging to the peak.
                          ) const;
 
     /// Finds the data vector index where the monotoniously decreasing signal crosses the

source/SoundTouch/RateTransposer.cpp

@@ -288,7 +288,7 @@ void TransposerBase::setRate(double newRate)
 TransposerBase *TransposerBase::newInstance()
 {
 #ifdef SOUNDTOUCH_INTEGER_SAMPLES
-    // Notice: For integer arithmetics support only linear algorithm (due to simplest calculus)
+    // Notice: For integer arithmetic support only linear algorithm (due to simplest calculus)
     return ::new InterpolateLinearInteger;
 #else
     switch (algorithm)

source/SoundTouch/RateTransposer.h

@@ -126,12 +126,12 @@ public:
     virtual ~RateTransposer();
 
     /// Operator 'new' is overloaded so that it automatically creates a suitable instance 
-    /// depending on if we're to use integer or floating point arithmetics.
+    /// depending on if we're to use integer or floating point arithmetic.
 //    static void *operator new(size_t s);
 
     /// Use this function instead of "new" operator to create a new instance of this class. 
     /// This function automatically chooses a correct implementation, depending on if 
-    /// integer or floating point arithmetics are to be used.
+    /// integer or floating point arithmetic are to be used.
 //    static RateTransposer *newInstance();
 
     /// Returns the output buffer object

source/SoundTouch/TDStretch.cpp

@@ -804,7 +804,7 @@ TDStretch * TDStretch::newInstance()
 
 //////////////////////////////////////////////////////////////////////////////
 //
-// Integer arithmetics specific algorithm implementations.
+// Integer arithmetic specific algorithm implementations.
 //
 //////////////////////////////////////////////////////////////////////////////
 
@@ -969,7 +969,7 @@ double TDStretch::calcCrossCorrAccumulate(const short *mixingPos, const short *c
 
 //////////////////////////////////////////////////////////////////////////////
 //
-// Floating point arithmetics specific algorithm implementations.
+// Floating point arithmetic specific algorithm implementations.
 //
 
 #ifdef SOUNDTOUCH_FLOAT_SAMPLES