deleted file mode 100644

@@ -1,238 +0,0 @@

-//////////////////////////////////////////////////////////////////////////////

-///

-/// SoundTouch - main class for tempo/pitch/rate adjusting routines.

-///

-/// Notes:

-/// - Initialize the SoundTouch object instance by setting up the sound stream

-///   parameters with functions 'setSampleRate' and 'setChannels', then set

-///   desired tempo/pitch/rate settings with the corresponding functions.

-///

-/// - The SoundTouch class behaves like a first-in-first-out pipeline: The

-///   samples that are to be processed are fed into one of the pipe by calling

-///   function 'putSamples', while the ready processed samples can be read

-///   from the other end of the pipeline with function 'receiveSamples'.

-///

-/// - The SoundTouch processing classes require certain sized 'batches' of

-///   samples in order to process the sound. For this reason the classes buffer

-///   incoming samples until there are enough of samples available for

-///   processing, then they carry out the processing step and consequently

-///   make the processed samples available for outputting.

-///

-/// - For the above reason, the processing routines introduce a certain

-///   'latency' between the input and output, so that the samples input to

-///   SoundTouch may not be immediately available in the output, and neither

-///   the amount of outputtable samples may not immediately be in direct

-///   relationship with the amount of previously input samples.

-///

-/// - The tempo/pitch/rate control parameters can be altered during processing.

-///   Please notice though that they aren't currently protected by semaphores,

-///   so in multi-thread application external semaphore protection may be

-///   required.

-///

-/// - This class utilizes classes 'TDStretch' for tempo change (without modifying

-///   pitch) and 'RateTransposer' for changing the playback rate (that is, both

-///   tempo and pitch in the same ratio) of the sound. The third available control

-///   'pitch' (change pitch but maintain tempo) is produced by a combination of

-///   combining the two other controls.

-///

-/// Author        : Copyright (c) Olli Parviainen

-/// Author e-mail : oparviai 'at' iki.fi

-/// SoundTouch WWW: http://www.surina.net/soundtouch

-///

-////////////////////////////////////////////////////////////////////////////////

-//

-// Last changed  : $Date: 2012-12-28 17:32:59 -0200 (sex, 28 dez 2012) $

-// File revision : $Revision: 4 $

-//

-// $Id: SoundTouch.h 163 2012-12-28 19:32:59Z oparviai $

-//

-////////////////////////////////////////////////////////////////////////////////

-//

-// License :

-//

-//  SoundTouch audio processing library

-//  Copyright (c) Olli Parviainen

-//

-//  This library is free software; you can redistribute it and/or

-//  modify it under the terms of the GNU Lesser General Public

-//  License as published by the Free Software Foundation; either

-//  version 2.1 of the License, or (at your option) any later version.

-//

-//  This library is distributed in the hope that it will be useful,

-//  but WITHOUT ANY WARRANTY; without even the implied warranty of

-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

-//  Lesser General Public License for more details.

-//

-//  You should have received a copy of the GNU Lesser General Public

-//  License along with this library; if not, write to the Free Software

-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

-//

-////////////////////////////////////////////////////////////////////////////////

-

-#pragma once

-

-#include <memory>

-#include "FIFOSamplePipe.h"

-#include "RateTransposer.h"

-#include "TDStretch.h"

-

-namespace soundtouch

-{

-

-/// Soundtouch library version string

-const char *const SOUNDTOUCH_VERSION = "1.7.1";

-

-/// SoundTouch library version id

-const uint32_t SOUNDTOUCH_VERSION_ID = 010701;

-

-// Available setting IDs for the 'setSetting' & 'get_setting' functions:

-

-/// Enable/disable anti-alias filter in pitch transposer (0 = disable)

-const int32_t SETTING_USE_AA_FILTER = 0;

-

-/// Pitch transposer anti-alias filter length (8 .. 128 taps, default = 32)

-const int32_t SETTING_AA_FILTER_LENGTH = 1;

-

-/// Enable/disable quick seeking algorithm in tempo changer routine

-/// (enabling quick seeking lowers CPU utilization but causes a minor sound

-///  quality compromising)

-const int32_t SETTING_USE_QUICKSEEK = 2;

-

-/// Time-stretch algorithm single processing sequence length in milliseconds. This determines

-/// to how long sequences the original sound is chopped in the time-stretch algorithm.

-/// See "STTypes.h" or README for more information.

-const int32_t SETTING_SEQUENCE_MS = 3;

-

-/// Time-stretch algorithm seeking window length in milliseconds for algorithm that finds the

-/// best possible overlapping location. This determines from how wide window the algorithm

-/// may look for an optimal joining location when mixing the sound sequences back together.

-/// See "STTypes.h" or README for more information.

-const int32_t SETTING_SEEKWINDOW_MS = 4;

-

-/// Time-stretch algorithm overlap length in milliseconds. When the chopped sound sequences

-/// are mixed back together, to form a continuous sound stream, this parameter defines over

-/// how long period the two consecutive sequences are let to overlap each other.

-/// See "STTypes.h" or README for more information.

-const int32_t SETTING_OVERLAP_MS = 5;

-

-/// Call "getSetting" with this ID to query nominal average processing sequence

-/// size in samples. This value tells approcimate value how many input samples

-/// SoundTouch needs to gather before it does DSP processing run for the sample batch.

-///

-/// Notices:

-/// - This is read-only parameter, i.e. setSetting ignores this parameter

-/// - Returned value is approximate average value, exact processing batch

-///   size may wary from time to time

-/// - This parameter value is not constant but may change depending on

-///   tempo/pitch/rate/samplerate settings.

-const int32_t SETTING_NOMINAL_INPUT_SEQUENCE = 6;

-

-/// Call "getSetting" with this ID to query nominal average processing output

-/// size in samples. This value tells approcimate value how many output samples

-/// SoundTouch outputs once it does DSP processing run for a batch of input samples.

-///

-/// Notices:

-/// - This is read-only parameter, i.e. setSetting ignores this parameter

-/// - Returned value is approximate average value, exact processing batch

-///   size may wary from time to time

-/// - This parameter value is not constant but may change depending on

-///   tempo/pitch/rate/samplerate settings.

-const int32_t SETTING_NOMINAL_OUTPUT_SEQUENCE = 7;

-

-class SoundTouch : public FIFOProcessor

-{

-private:

-	/// Rate transposer class instance

-	std::unique_ptr<RateTransposer> pRateTransposer;

-

-	/// Time-stretch class instance

-	std::unique_ptr<TDStretch> pTDStretch;

-

-	/// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters.

-	float virtualRate;

-

-	/// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters.

-	float virtualTempo;

-

-	/// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters.

-	float virtualPitch;

-

-	/// Flag: Has sample rate been set?

-	bool bSrateSet;

-

-	/// Calculates effective rate & tempo valuescfrom 'virtualRate', 'virtualTempo' and

-	/// 'virtualPitch' parameters.

-	void calcEffectiveRateAndTempo();

-

-protected:

-	/// Number of channels

-	uint32_t channels;

-

-	/// Effective 'rate' value calculated from 'virtualRate', 'virtualTempo' and 'virtualPitch'

-	float rate;

-

-	/// Effective 'tempo' value calculated from 'virtualRate', 'virtualTempo' and 'virtualPitch'

-	float tempo;

-

-public:

-	SoundTouch();

-

-	/// Sets new rate control value. Normal rate = 1.0, smaller values

-	/// represent slower rate, larger faster rates.

-	void setRate(float newRate);

-

-	/// Sets new tempo control value. Normal tempo = 1.0, smaller values

-	/// represent slower tempo, larger faster tempo.

-	void setTempo(float newTempo);

-

-	/// Sets the number of channels, 1 = mono, 2 = stereo

-	void setChannels(uint32_t numChannels);

-

-	/// Sets sample rate.

-	void setSampleRate(uint32_t srate);

-

-	/// Flushes the last samples from the processing pipeline to the output.

-	/// Clears also the internal processing buffers.

-	//

-	/// Note: This function is meant for extracting the last samples of a sound

-	/// stream. This function may introduce additional blank samples in the end

-	/// of the sound stream, and thus it's not recommended to call this function

-	/// in the middle of a sound stream.

-	void flush();

-

-	/// Adds 'numSamples' pcs of samples from the 'samples' memory position into

-	/// the input of the object. Notice that sample rate _has_to_ be set before

-	/// calling this function, otherwise throws a runtime_error exception.

-	void putSamples(

-            const SAMPLETYPE *samples,  ///< Pointer to sample buffer.

-            uint32_t numSamples                         ///< Number of samples in buffer. Notice

-                                                        ///< that in case of stereo-sound a single sample

-                                                        ///< contains data for both channels.

-            );

-

-	/// Clears all the samples in the object's output and internal processing

-	/// buffers.

-	void clear();

-

-	/// Changes a setting controlling the processing system behaviour. See the

-	/// 'SETTING_...' defines for available setting ID's.

-	///

-	/// \return 'true' if the setting was succesfully changed

-	bool setSetting(int32_t settingId,   ///< Setting ID number. see SETTING_... defines.

-                    int32_t value        ///< New setting value.

-                    );

-

-	/// Returns number of samples currently unprocessed.

-	uint32_t numUnprocessedSamples() const;

-

-	/// Other handy functions that are implemented in the ancestor classes (see

-	/// classes 'FIFOProcessor' and 'FIFOSamplePipe')

-	///

-	/// - receiveSamples() : Use this function to receive 'ready' processed samples from SoundTouch.

-	/// - numSamples()     : Get number of 'ready' samples that can be received with

-	///                      function 'receiveSamples()'

-	/// - isEmpty()        : Returns nonzero if there aren't any 'ready' samples.

-	/// - clear()          : Clears all samples from ready/processing buffers.

-};

-

-}

@@ -73,6 +73,8 @@

 #include <memory>

 #include "FIFOSamplePipe.h"

+#include "RateTransposer.h"

+#include "TDStretch.h"

 namespace soundtouch

 {

@@ -114,32 +116,29 @@ const int32_t SETTING_SEEKWINDOW_MS = 4;

 const int32_t SETTING_OVERLAP_MS = 5;

 /// Call "getSetting" with this ID to query nominal average processing sequence

-/// size in samples. This value tells approcimate value how many input samples 

+/// size in samples. This value tells approcimate value how many input samples

 /// SoundTouch needs to gather before it does DSP processing run for the sample batch.

 ///

-/// Notices: 

+/// Notices:

 /// - This is read-only parameter, i.e. setSetting ignores this parameter

 /// - Returned value is approximate average value, exact processing batch

 ///   size may wary from time to time

-/// - This parameter value is not constant but may change depending on 

+/// - This parameter value is not constant but may change depending on

 ///   tempo/pitch/rate/samplerate settings.

 const int32_t SETTING_NOMINAL_INPUT_SEQUENCE = 6;

-/// Call "getSetting" with this ID to query nominal average processing output 

-/// size in samples. This value tells approcimate value how many output samples 

+/// Call "getSetting" with this ID to query nominal average processing output

+/// size in samples. This value tells approcimate value how many output samples

 /// SoundTouch outputs once it does DSP processing run for a batch of input samples.

-///	

-/// Notices: 

+///

+/// Notices:

 /// - This is read-only parameter, i.e. setSetting ignores this parameter

 /// - Returned value is approximate average value, exact processing batch

 ///   size may wary from time to time

-/// - This parameter value is not constant but may change depending on 

+/// - This parameter value is not constant but may change depending on

 ///   tempo/pitch/rate/samplerate settings.

 const int32_t SETTING_NOMINAL_OUTPUT_SEQUENCE = 7;

-class RateTransposer;

-class TDStretch;

-

 class SoundTouch : public FIFOProcessor

 {

 private:

@@ -69,8 +69,7 @@

 //

 ////////////////////////////////////////////////////////////////////////////////

-#ifndef SoundTouch_H

-#define SoundTouch_H

+#pragma once

 #include <memory>

 #include "FIFOSamplePipe.h"

@@ -238,5 +237,3 @@ public:

 };

 }

-

-#endif

@@ -178,7 +178,6 @@ protected:

 public:

 	SoundTouch();

-	virtual ~SoundTouch();

 	/// Sets new rate control value. Normal rate = 1.0, smaller values

 	/// represent slower rate, larger faster rates.

@@ -188,27 +187,6 @@ public:

 	/// represent slower tempo, larger faster tempo.

 	void setTempo(float newTempo);

-	/// Sets new rate control value as a difference in percents compared

-	/// to the original rate (-50 .. +100 %)

-	void setRateChange(float newRate);

-

-	/// Sets new tempo control value as a difference in percents compared

-	/// to the original tempo (-50 .. +100 %)

-	void setTempoChange(float newTempo);

-

-	/// Sets new pitch control value. Original pitch = 1.0, smaller values

-	/// represent lower pitches, larger values higher pitch.

-	void setPitch(float newPitch);

-

-	/// Sets pitch change in octaves compared to the original pitch

-	/// (-1.00 .. +1.00)

-	void setPitchOctaves(float newPitch);

-

-	/// Sets pitch change in semi-tones compared to the original pitch

-	/// (-12 .. +12)

-	void setPitchSemiTones(int newPitch);

-	void setPitchSemiTones(float newPitch);

-

 	/// Sets the number of channels, 1 = mono, 2 = stereo

 	void setChannels(uint32_t numChannels);

@@ -227,7 +205,7 @@ public:

 	/// Adds 'numSamples' pcs of samples from the 'samples' memory position into

 	/// the input of the object. Notice that sample rate _has_to_ be set before

 	/// calling this function, otherwise throws a runtime_error exception.

-	virtual void putSamples(

+	void putSamples(

             const SAMPLETYPE *samples,  ///< Pointer to sample buffer.

             uint32_t numSamples                         ///< Number of samples in buffer. Notice

                                                         ///< that in case of stereo-sound a single sample

@@ -236,7 +214,7 @@ public:

 	/// Clears all the samples in the object's output and internal processing

 	/// buffers.

-	virtual void clear();

+	void clear();

 	/// Changes a setting controlling the processing system behaviour. See the

 	/// 'SETTING_...' defines for available setting ID's.

@@ -246,15 +224,8 @@ public:

                     int32_t value        ///< New setting value.

                     );

-	/// Reads a setting controlling the processing system behaviour. See the

-	/// 'SETTING_...' defines for available setting ID's.

-	///

-	/// \return the setting value.

-	int32_t getSetting(int32_t settingId    ///< Setting ID number, see SETTING_... defines.

-                    ) const;

-

 	/// Returns number of samples currently unprocessed.

-	virtual uint32_t numUnprocessedSamples() const;

+	uint32_t numUnprocessedSamples() const;

 	/// Other handy functions that are implemented in the ancestor classes (see

 	/// classes 'FIFOProcessor' and 'FIFOSamplePipe')

@@ -41,10 +41,10 @@

 ///

 ////////////////////////////////////////////////////////////////////////////////

 //

-// Last changed  : $Date: 2006/02/05 16:44:06 $

-// File revision : $Revision: 1.14 $

+// Last changed  : $Date: 2012-12-28 17:32:59 -0200 (sex, 28 dez 2012) $

+// File revision : $Revision: 4 $

 //

-// $Id: SoundTouch.h,v 1.14 2006/02/05 16:44:06 Olli Exp $

+// $Id: SoundTouch.h 163 2012-12-28 19:32:59Z oparviai $

 //

 ////////////////////////////////////////////////////////////////////////////////

 //

@@ -72,57 +72,83 @@

 #ifndef SoundTouch_H

 #define SoundTouch_H

+#include <memory>

 #include "FIFOSamplePipe.h"

-#include "STTypes.h"

 namespace soundtouch

 {

 /// Soundtouch library version string

-static const char *const SOUNDTOUCH_VERSION = "1.3.1";

+const char *const SOUNDTOUCH_VERSION = "1.7.1";

 /// SoundTouch library version id

-static const uint32_t SOUNDTOUCH_VERSION_ID = 010301;

+const uint32_t SOUNDTOUCH_VERSION_ID = 010701;

-//

 // Available setting IDs for the 'setSetting' & 'get_setting' functions:

 /// Enable/disable anti-alias filter in pitch transposer (0 = disable)

-static const uint32_t SETTING_USE_AA_FILTER = 0;

+const int32_t SETTING_USE_AA_FILTER = 0;

 /// Pitch transposer anti-alias filter length (8 .. 128 taps, default = 32)

-static const uint32_t SETTING_AA_FILTER_LENGTH = 1;

+const int32_t SETTING_AA_FILTER_LENGTH = 1;

 /// Enable/disable quick seeking algorithm in tempo changer routine

 /// (enabling quick seeking lowers CPU utilization but causes a minor sound

 ///  quality compromising)

-static const uint32_t SETTING_USE_QUICKSEEK = 2;

+const int32_t SETTING_USE_QUICKSEEK = 2;

 /// Time-stretch algorithm single processing sequence length in milliseconds. This determines

 /// to how long sequences the original sound is chopped in the time-stretch algorithm.

 /// See "STTypes.h" or README for more information.

-static const uint32_t SETTING_SEQUENCE_MS = 3;

+const int32_t SETTING_SEQUENCE_MS = 3;

 /// Time-stretch algorithm seeking window length in milliseconds for algorithm that finds the

 /// best possible overlapping location. This determines from how wide window the algorithm

 /// may look for an optimal joining location when mixing the sound sequences back together.

 /// See "STTypes.h" or README for more information.

-static const uint32_t SETTING_SEEKWINDOW_MS = 4;

+const int32_t SETTING_SEEKWINDOW_MS = 4;

 /// Time-stretch algorithm overlap length in milliseconds. When the chopped sound sequences

 /// are mixed back together, to form a continuous sound stream, this parameter defines over

 /// how long period the two consecutive sequences are let to overlap each other.

 /// See "STTypes.h" or README for more information.

-static const uint32_t SETTING_OVERLAP_MS = 5;

+const int32_t SETTING_OVERLAP_MS = 5;

+

+/// Call "getSetting" with this ID to query nominal average processing sequence

+/// size in samples. This value tells approcimate value how many input samples 

+/// SoundTouch needs to gather before it does DSP processing run for the sample batch.

+///

+/// Notices: 

+/// - This is read-only parameter, i.e. setSetting ignores this parameter

+/// - Returned value is approximate average value, exact processing batch

+///   size may wary from time to time

+/// - This parameter value is not constant but may change depending on 

+///   tempo/pitch/rate/samplerate settings.

+const int32_t SETTING_NOMINAL_INPUT_SEQUENCE = 6;

+

+/// Call "getSetting" with this ID to query nominal average processing output 

+/// size in samples. This value tells approcimate value how many output samples 

+/// SoundTouch outputs once it does DSP processing run for a batch of input samples.

+///	

+/// Notices: 

+/// - This is read-only parameter, i.e. setSetting ignores this parameter

+/// - Returned value is approximate average value, exact processing batch

+///   size may wary from time to time

+/// - This parameter value is not constant but may change depending on 

+///   tempo/pitch/rate/samplerate settings.

+const int32_t SETTING_NOMINAL_OUTPUT_SEQUENCE = 7;

+

+class RateTransposer;

+class TDStretch;

 class SoundTouch : public FIFOProcessor

 {

 private:

 	/// Rate transposer class instance

-	class RateTransposer *pRateTransposer;

+	std::unique_ptr<RateTransposer> pRateTransposer;

 	/// Time-stretch class instance

-	class TDStretch *pTDStretch;

+	std::unique_ptr<TDStretch> pTDStretch;

 	/// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters.

 	float virtualRate;

@@ -134,15 +160,15 @@ private:

 	float virtualPitch;

 	/// Flag: Has sample rate been set?

-	bool  bSrateSet;

+	bool bSrateSet;

 	/// Calculates effective rate & tempo valuescfrom 'virtualRate', 'virtualTempo' and

 	/// 'virtualPitch' parameters.

 	void calcEffectiveRateAndTempo();

-protected :

+protected:

 	/// Number of channels

-	uint32_t  channels;

+	uint32_t channels;

 	/// Effective 'rate' value calculated from 'virtualRate', 'virtualTempo' and 'virtualPitch'

 	float rate;

@@ -154,12 +180,6 @@ public:

 	SoundTouch();

 	virtual ~SoundTouch();

-	/// Get SoundTouch library version string

-	static const char *getVersionString();

-

-	/// Get SoundTouch library version Id

-	static uint32_t getVersionId();

-

 	/// Sets new rate control value. Normal rate = 1.0, smaller values

 	/// represent slower rate, larger faster rates.

 	void setRate(float newRate);

@@ -222,15 +242,15 @@ public:

 	/// 'SETTING_...' defines for available setting ID's.

 	///

 	/// \return 'true' if the setting was succesfully changed

-	bool setSetting(uint32_t settingId,   ///< Setting ID number. see SETTING_... defines.

-                    uint32_t value        ///< New setting value.

+	bool setSetting(int32_t settingId,   ///< Setting ID number. see SETTING_... defines.

+                    int32_t value        ///< New setting value.

                     );

 	/// Reads a setting controlling the processing system behaviour. See the

 	/// 'SETTING_...' defines for available setting ID's.

 	///

 	/// \return the setting value.

-	uint32_t getSetting(uint32_t settingId    ///< Setting ID number, see SETTING_... defines.

+	int32_t getSetting(int32_t settingId    ///< Setting ID number, see SETTING_... defines.

                     ) const;

 	/// Returns number of samples currently unprocessed.

new file mode 100644

@@ -0,0 +1,251 @@

+//////////////////////////////////////////////////////////////////////////////

+///

+/// SoundTouch - main class for tempo/pitch/rate adjusting routines.

+///

+/// Notes:

+/// - Initialize the SoundTouch object instance by setting up the sound stream

+///   parameters with functions 'setSampleRate' and 'setChannels', then set

+///   desired tempo/pitch/rate settings with the corresponding functions.

+///

+/// - The SoundTouch class behaves like a first-in-first-out pipeline: The

+///   samples that are to be processed are fed into one of the pipe by calling

+///   function 'putSamples', while the ready processed samples can be read

+///   from the other end of the pipeline with function 'receiveSamples'.

+///

+/// - The SoundTouch processing classes require certain sized 'batches' of

+///   samples in order to process the sound. For this reason the classes buffer

+///   incoming samples until there are enough of samples available for

+///   processing, then they carry out the processing step and consequently

+///   make the processed samples available for outputting.

+///

+/// - For the above reason, the processing routines introduce a certain

+///   'latency' between the input and output, so that the samples input to

+///   SoundTouch may not be immediately available in the output, and neither

+///   the amount of outputtable samples may not immediately be in direct

+///   relationship with the amount of previously input samples.

+///

+/// - The tempo/pitch/rate control parameters can be altered during processing.

+///   Please notice though that they aren't currently protected by semaphores,

+///   so in multi-thread application external semaphore protection may be

+///   required.

+///

+/// - This class utilizes classes 'TDStretch' for tempo change (without modifying

+///   pitch) and 'RateTransposer' for changing the playback rate (that is, both

+///   tempo and pitch in the same ratio) of the sound. The third available control

+///   'pitch' (change pitch but maintain tempo) is produced by a combination of

+///   combining the two other controls.

+///

+/// Author        : Copyright (c) Olli Parviainen

+/// Author e-mail : oparviai 'at' iki.fi

+/// SoundTouch WWW: http://www.surina.net/soundtouch

+///

+////////////////////////////////////////////////////////////////////////////////

+//

+// Last changed  : $Date: 2006/02/05 16:44:06 $

+// File revision : $Revision: 1.14 $

+//

+// $Id: SoundTouch.h,v 1.14 2006/02/05 16:44:06 Olli Exp $

+//

+////////////////////////////////////////////////////////////////////////////////

+//

+// License :

+//

+//  SoundTouch audio processing library

+//  Copyright (c) Olli Parviainen

+//

+//  This library is free software; you can redistribute it and/or

+//  modify it under the terms of the GNU Lesser General Public

+//  License as published by the Free Software Foundation; either

+//  version 2.1 of the License, or (at your option) any later version.

+//

+//  This library is distributed in the hope that it will be useful,

+//  but WITHOUT ANY WARRANTY; without even the implied warranty of

+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+//  Lesser General Public License for more details.

+//

+//  You should have received a copy of the GNU Lesser General Public

+//  License along with this library; if not, write to the Free Software

+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+////////////////////////////////////////////////////////////////////////////////

+

+#ifndef SoundTouch_H

+#define SoundTouch_H

+

+#include "FIFOSamplePipe.h"

+#include "STTypes.h"

+

+namespace soundtouch

+{

+

+/// Soundtouch library version string

+static const char *const SOUNDTOUCH_VERSION = "1.3.1";

+

+/// SoundTouch library version id

+static const uint32_t SOUNDTOUCH_VERSION_ID = 010301;

+

+//

+// Available setting IDs for the 'setSetting' & 'get_setting' functions:

+

+/// Enable/disable anti-alias filter in pitch transposer (0 = disable)

+static const uint32_t SETTING_USE_AA_FILTER = 0;

+

+/// Pitch transposer anti-alias filter length (8 .. 128 taps, default = 32)

+static const uint32_t SETTING_AA_FILTER_LENGTH = 1;

+

+/// Enable/disable quick seeking algorithm in tempo changer routine

+/// (enabling quick seeking lowers CPU utilization but causes a minor sound

+///  quality compromising)

+static const uint32_t SETTING_USE_QUICKSEEK = 2;

+

+/// Time-stretch algorithm single processing sequence length in milliseconds. This determines

+/// to how long sequences the original sound is chopped in the time-stretch algorithm.

+/// See "STTypes.h" or README for more information.

+static const uint32_t SETTING_SEQUENCE_MS = 3;

+

+/// Time-stretch algorithm seeking window length in milliseconds for algorithm that finds the

+/// best possible overlapping location. This determines from how wide window the algorithm

+/// may look for an optimal joining location when mixing the sound sequences back together.

+/// See "STTypes.h" or README for more information.

+static const uint32_t SETTING_SEEKWINDOW_MS = 4;

+

+/// Time-stretch algorithm overlap length in milliseconds. When the chopped sound sequences

+/// are mixed back together, to form a continuous sound stream, this parameter defines over

+/// how long period the two consecutive sequences are let to overlap each other.

+/// See "STTypes.h" or README for more information.

+static const uint32_t SETTING_OVERLAP_MS = 5;

+

+class SoundTouch : public FIFOProcessor

+{

+private:

+	/// Rate transposer class instance

+	class RateTransposer *pRateTransposer;

+

+	/// Time-stretch class instance

+	class TDStretch *pTDStretch;

+

+	/// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters.

+	float virtualRate;

+

+	/// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters.

+	float virtualTempo;

+

+	/// Virtual pitch parameter. Effective rate & tempo are calculated from these parameters.

+	float virtualPitch;

+

+	/// Flag: Has sample rate been set?

+	bool  bSrateSet;

+

+	/// Calculates effective rate & tempo valuescfrom 'virtualRate', 'virtualTempo' and

+	/// 'virtualPitch' parameters.

+	void calcEffectiveRateAndTempo();

+

+protected :

+	/// Number of channels

+	uint32_t  channels;

+

+	/// Effective 'rate' value calculated from 'virtualRate', 'virtualTempo' and 'virtualPitch'

+	float rate;

+

+	/// Effective 'tempo' value calculated from 'virtualRate', 'virtualTempo' and 'virtualPitch'

+	float tempo;

+

+public:

+	SoundTouch();

+	virtual ~SoundTouch();

+

+	/// Get SoundTouch library version string

+	static const char *getVersionString();

+

+	/// Get SoundTouch library version Id

+	static uint32_t getVersionId();

+

+	/// Sets new rate control value. Normal rate = 1.0, smaller values

+	/// represent slower rate, larger faster rates.

+	void setRate(float newRate);

+

+	/// Sets new tempo control value. Normal tempo = 1.0, smaller values

+	/// represent slower tempo, larger faster tempo.

+	void setTempo(float newTempo);

+

+	/// Sets new rate control value as a difference in percents compared

+	/// to the original rate (-50 .. +100 %)

+	void setRateChange(float newRate);

+

+	/// Sets new tempo control value as a difference in percents compared

+	/// to the original tempo (-50 .. +100 %)

+	void setTempoChange(float newTempo);

+

+	/// Sets new pitch control value. Original pitch = 1.0, smaller values

+	/// represent lower pitches, larger values higher pitch.

+	void setPitch(float newPitch);

+

+	/// Sets pitch change in octaves compared to the original pitch

+	/// (-1.00 .. +1.00)

+	void setPitchOctaves(float newPitch);

+

+	/// Sets pitch change in semi-tones compared to the original pitch

+	/// (-12 .. +12)

+	void setPitchSemiTones(int newPitch);

+	void setPitchSemiTones(float newPitch);

+

+	/// Sets the number of channels, 1 = mono, 2 = stereo

+	void setChannels(uint32_t numChannels);

+

+	/// Sets sample rate.

+	void setSampleRate(uint32_t srate);

+

+	/// Flushes the last samples from the processing pipeline to the output.

+	/// Clears also the internal processing buffers.

+	//

+	/// Note: This function is meant for extracting the last samples of a sound

+	/// stream. This function may introduce additional blank samples in the end

+	/// of the sound stream, and thus it's not recommended to call this function

+	/// in the middle of a sound stream.

+	void flush();

+

+	/// Adds 'numSamples' pcs of samples from the 'samples' memory position into

+	/// the input of the object. Notice that sample rate _has_to_ be set before

+	/// calling this function, otherwise throws a runtime_error exception.

+	virtual void putSamples(

+            const SAMPLETYPE *samples,  ///< Pointer to sample buffer.

+            uint32_t numSamples                         ///< Number of samples in buffer. Notice

+                                                        ///< that in case of stereo-sound a single sample

+                                                        ///< contains data for both channels.

+            );

+

+	/// Clears all the samples in the object's output and internal processing

+	/// buffers.

+	virtual void clear();

+

+	/// Changes a setting controlling the processing system behaviour. See the

+	/// 'SETTING_...' defines for available setting ID's.

+	///

+	/// \return 'true' if the setting was succesfully changed

+	bool setSetting(uint32_t settingId,   ///< Setting ID number. see SETTING_... defines.

+                    uint32_t value        ///< New setting value.

+                    );

+

+	/// Reads a setting controlling the processing system behaviour. See the

+	/// 'SETTING_...' defines for available setting ID's.

+	///

+	/// \return the setting value.

+	uint32_t getSetting(uint32_t settingId    ///< Setting ID number, see SETTING_... defines.

+                    ) const;

+

+	/// Returns number of samples currently unprocessed.

+	virtual uint32_t numUnprocessedSamples() const;

+

+	/// Other handy functions that are implemented in the ancestor classes (see

+	/// classes 'FIFOProcessor' and 'FIFOSamplePipe')

+	///

+	/// - receiveSamples() : Use this function to receive 'ready' processed samples from SoundTouch.

+	/// - numSamples()     : Get number of 'ready' samples that can be received with

+	///                      function 'receiveSamples()'

+	/// - isEmpty()        : Returns nonzero if there aren't any 'ready' samples.

+	/// - clear()          : Clears all samples from ready/processing buffers.

+};

+

+}

+

+#endif