From 6b6c36d3e19702e737ad1cb36ec9d5c214c04e38 Mon Sep 17 00:00:00 2001 From: Isamu Mogi Date: Fri, 1 Jun 2018 21:49:08 +0900 Subject: [PATCH 1/3] Update Visual Studio files on EXTRA_DIST This fixes following error on `make dist`: ``` make[6]: *** No rule to make target `SoundTouch.dsp', needed by `distdir-am'. Stop. ``` --- source/SoundStretch/Makefile.am | 2 +- source/SoundTouch/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/SoundStretch/Makefile.am b/source/SoundStretch/Makefile.am index a87e841..ac5292c 100644 --- a/source/SoundStretch/Makefile.am +++ b/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 _SOURCES. This lists ## all the sources in the current directory that are used to build soundstretch. diff --git a/source/SoundTouch/Makefile.am b/source/SoundTouch/Makefile.am index 58c9e33..930669f 100644 --- a/source/SoundTouch/Makefile.am +++ b/source/SoundTouch/Makefile.am @@ -20,7 +20,7 @@ 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 From 6ee56b1c17b0bf9a31f59c330ab382c1b6f19bfa Mon Sep 17 00:00:00 2001 From: Isamu Mogi Date: Fri, 1 Jun 2018 21:58:57 +0900 Subject: [PATCH 2/3] Add Interpolate*.h to noinst_HEADERS This fixes following error on `make distcheck` ``` Making all in SoundTouch CXX AAFilter.lo CXX FIRFilter.lo CXX FIFOSampleBuffer.lo CXX RateTransposer.lo ../../../../source/SoundTouch/RateTransposer.cpp:39:10: fatal error: 'InterpolateLinear.h' file not found ^~~~~~~~~~~~~~~~~~~~~ 1 error generated. ``` --- source/SoundTouch/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/SoundTouch/Makefile.am b/source/SoundTouch/Makefile.am index 58c9e33..0453aa8 100644 --- a/source/SoundTouch/Makefile.am +++ b/source/SoundTouch/Makefile.am @@ -22,7 +22,8 @@ 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 -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 # From 0093b63141a56ece2fd955a3e3a52436d2a00280 Mon Sep 17 00:00:00 2001 From: "luz.paz" Date: Fri, 27 Jul 2018 12:26:56 -0400 Subject: [PATCH 3/3] MIsc. source comment typos Found via `codespell -q 3` --- source/Android-lib/README-SoundTouch-Android.html | 2 +- source/SoundTouch/BPMDetect.cpp | 2 +- source/SoundTouch/InterpolateLinear.h | 4 ++-- source/SoundTouch/PeakFinder.h | 4 ++-- source/SoundTouch/RateTransposer.cpp | 2 +- source/SoundTouch/RateTransposer.h | 4 ++-- source/SoundTouch/TDStretch.cpp | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/source/Android-lib/README-SoundTouch-Android.html b/source/Android-lib/README-SoundTouch-Android.html index 91a6a00..4a2c809 100644 --- a/source/Android-lib/README-SoundTouch-Android.html +++ b/source/Android-lib/README-SoundTouch-Android.html @@ -45,7 +45,7 @@ open Cygwin/bash shell, go to directory "soundtouch/source/Android-lib/jni" and invoke the NDK compiler with following command:

    $NDK/ndk-build
-

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 "libs" 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.

+

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 "libs" 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.

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 "NDK". That's easiest done by adding the NDK path definition at end of diff --git a/source/SoundTouch/BPMDetect.cpp b/source/SoundTouch/BPMDetect.cpp index 4f44e0c..ea3b0bd 100644 --- a/source/SoundTouch/BPMDetect.cpp +++ b/source/SoundTouch/BPMDetect.cpp @@ -428,7 +428,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) { diff --git a/source/SoundTouch/InterpolateLinear.h b/source/SoundTouch/InterpolateLinear.h index 601af8d..faa2e2c 100644 --- a/source/SoundTouch/InterpolateLinear.h +++ b/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: diff --git a/source/SoundTouch/PeakFinder.h b/source/SoundTouch/PeakFinder.h index 6aaaea1..9fe66ad 100644 --- a/source/SoundTouch/PeakFinder.h +++ b/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 diff --git a/source/SoundTouch/RateTransposer.cpp b/source/SoundTouch/RateTransposer.cpp index 8b66be3..b817497 100644 --- a/source/SoundTouch/RateTransposer.cpp +++ b/source/SoundTouch/RateTransposer.cpp @@ -289,7 +289,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) diff --git a/source/SoundTouch/RateTransposer.h b/source/SoundTouch/RateTransposer.h index dca7429..cee4a58 100644 --- a/source/SoundTouch/RateTransposer.h +++ b/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 diff --git a/source/SoundTouch/TDStretch.cpp b/source/SoundTouch/TDStretch.cpp index 149cdb9..12ae3f7 100644 --- a/source/SoundTouch/TDStretch.cpp +++ b/source/SoundTouch/TDStretch.cpp @@ -805,7 +805,7 @@ TDStretch * TDStretch::newInstance() ////////////////////////////////////////////////////////////////////////////// // -// Integer arithmetics specific algorithm implementations. +// Integer arithmetic specific algorithm implementations. // ////////////////////////////////////////////////////////////////////////////// @@ -970,7 +970,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