deleted file mode 100644

@@ -1,216 +0,0 @@

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

-///

-/// 'FIFOSamplePipe' : An abstract base class for classes that manipulate sound

-/// samples by operating like a first-in-first-out pipe: New samples are fed

-/// into one end of the pipe with the 'putSamples' function, and the processed

-/// samples are received from the other end with the 'receiveSamples' function.

-///

-/// 'FIFOProcessor' : A base class for classes the do signal processing with

-/// the samples while operating like a first-in-first-out pipe. When samples

-/// are input with the 'putSamples' function, the class processes them

-/// and moves the processed samples to the given 'output' pipe object, which

-/// may be either another processing stage, or a fifo sample buffer object.

-///

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

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

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

-///

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

-//

-// Last changed  : $Date: 2012-06-13 16:29:53 -0300 (qua, 13 jun 2012) $

-// File revision : $Revision: 4 $

-//

-// $Id: FIFOSamplePipe.h 143 2012-06-13 19:29:53Z 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 <cassert>

-#include "STTypes.h"

-

-namespace soundtouch

-{

-

-/// Abstract base class for FIFO (first-in-first-out) sample processing classes.

-class FIFOSamplePipe

-{

-public:

-	// virtual default destructor

-	virtual ~FIFOSamplePipe() { }

-

-	/// Returns a pointer to the beginning of the output samples.

-	/// This function is provided for accessing the output samples directly.

-	/// Please be careful for not to corrupt the book-keeping!

-	///

-	/// When using this function to output samples, also remember to 'remove' the

-	/// output samples from the buffer by calling the

-	/// 'receiveSamples(numSamples)' function

-	virtual SAMPLETYPE *ptrBegin() = 0;

-

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

-	/// the sample buffer.

-	virtual void putSamples(const SAMPLETYPE *samples,  ///< Pointer to samples.

-                            uint32_t numSamples         ///< Number of samples to insert.

-                            ) = 0;

-

-	// Moves samples from the 'other' pipe instance to this instance.

-	void moveSamples(FIFOSamplePipe &other  ///< Other pipe instance where from the receive the data.

-         )

-	{

-		int oNumSamples = other.numSamples();

-

-		this->putSamples(other.ptrBegin(), oNumSamples);

-		other.receiveSamples(oNumSamples);

-	}

-

-	/// Output samples from beginning of the sample buffer. Copies requested samples to

-	/// output buffer and removes them from the sample buffer. If there are less than

-	/// 'numsample' samples in the buffer, returns all that available.

-	///

-	/// \return Number of samples returned.

-	virtual uint32_t receiveSamples(SAMPLETYPE *output, ///< Buffer where to copy output samples.

-                                uint32_t maxSamples                 ///< How many samples to receive at max.

-                                ) = 0;

-

-	/// Adjusts book-keeping so that given number of samples are removed from beginning of the

-	/// sample buffer without copying them anywhere.

-	///

-	/// Used to reduce the number of samples in the buffer when accessing the sample buffer directly

-	/// with 'ptrBegin' function.

-	virtual uint32_t receiveSamples(uint32_t maxSamples   ///< Remove this many samples from the beginning of pipe.

-                                ) = 0;

-

-	/// Returns number of samples currently available.

-	virtual uint32_t numSamples() const = 0;

-

-	// Returns nonzero if there aren't any samples available for outputting.

-	virtual bool isEmpty() const = 0;

-

-	/// Clears all the samples.

-	virtual void clear() = 0;

-

-	/// allow trimming (downwards) amount of samples in pipeline.

-	/// Returns adjusted amount of samples

-	virtual uint32_t adjustAmountOfSamples(uint32_t numSamples) = 0;

-};

-

-/// Base-class for sound processing routines working in FIFO principle. With this base

-/// class it's easy to implement sound processing stages that can be chained together,

-/// so that samples that are fed into beginning of the pipe automatically go through

-/// all the processing stages.

-///

-/// When samples are input to this class, they're first processed and then put to

-/// the FIFO pipe that's defined as output of this class. This output pipe can be

-/// either other processing stage or a FIFO sample buffer.

-class FIFOProcessor :public FIFOSamplePipe

-{

-protected:

-	/// Internal pipe where processed samples are put.

-	FIFOSamplePipe *output;

-

-	/// Sets output pipe.

-	void setOutPipe(FIFOSamplePipe *pOutput)

-	{

-		assert(!this->output);

-		assert(pOutput);

-		this->output = pOutput;

-	}

-

-	/// Constructor. Doesn't define output pipe; it has to be set be

-	/// 'setOutPipe' function.

-	FIFOProcessor()

-	{

-		this->output = nullptr;

-	}

-

-	/// Constructor. Configures output pipe.

-	FIFOProcessor(FIFOSamplePipe *pOutput   ///< Output pipe.

-                 )

-	{

-		this->output = pOutput;

-	}

-

-	/// Destructor.

-	virtual ~FIFOProcessor()

-	{

-	}

-

-	/// Returns a pointer to the beginning of the output samples.

-	/// This function is provided for accessing the output samples directly.

-	/// Please be careful for not to corrupt the book-keeping!

-	///

-	/// When using this function to output samples, also remember to 'remove' the

-	/// output samples from the buffer by calling the

-	/// 'receiveSamples(numSamples)' function

-	virtual SAMPLETYPE *ptrBegin()

-	{

-		return this->output->ptrBegin();

-	}

-

-public:

-	/// Output samples from beginning of the sample buffer. Copies requested samples to

-	/// output buffer and removes them from the sample buffer. If there are less than

-	/// 'numsample' samples in the buffer, returns all that available.

-	///

-	/// \return Number of samples returned.

-	virtual uint32_t receiveSamples(SAMPLETYPE *outBuffer, ///< Buffer where to copy output samples.

-                                uint32_t maxSamples                    ///< How many samples to receive at max.

-                                )

-	{

-		return this->output->receiveSamples(outBuffer, maxSamples);

-	}

-

-	/// Adjusts book-keeping so that given number of samples are removed from beginning of the

-	/// sample buffer without copying them anywhere.

-	///

-	/// Used to reduce the number of samples in the buffer when accessing the sample buffer directly

-	/// with 'ptrBegin' function.

-	virtual uint32_t receiveSamples(uint32_t maxSamples   ///< Remove this many samples from the beginning of pipe.

-                                )

-	{

-		return this->output->receiveSamples(maxSamples);

-	}

-

-	/// Returns number of samples currently available.

-	virtual uint32_t numSamples() const

-	{

-		return this->output->numSamples();

-	}

-

-	/// Returns nonzero if there aren't any samples available for outputting.

-	virtual bool isEmpty() const

-	{

-		return this->output->isEmpty();

-	}

-

-	/// allow trimming (downwards) amount of samples in pipeline.

-	/// Returns adjusted amount of samples

-	virtual uint32_t adjustAmountOfSamples(uint32_t numSmpls)

-	{

-		return this->output->adjustAmountOfSamples(numSmpls);

-	}

-};

-

-}

@@ -83,7 +83,7 @@ public:

 		this->putSamples(other.ptrBegin(), oNumSamples);

 		other.receiveSamples(oNumSamples);

-	};

+	}

 	/// Output samples from beginning of the sample buffer. Copies requested samples to

 	/// output buffer and removes them from the sample buffer. If there are less than

@@ -207,9 +207,9 @@ public:

 	/// allow trimming (downwards) amount of samples in pipeline.

 	/// Returns adjusted amount of samples

-	virtual uint32_t adjustAmountOfSamples(uint32_t numSamples)

+	virtual uint32_t adjustAmountOfSamples(uint32_t numSmpls)

 	{

-		return this->output->adjustAmountOfSamples(numSamples);

+		return this->output->adjustAmountOfSamples(numSmpls);

 	}

 };

@@ -45,8 +45,7 @@

 //

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

-#ifndef FIFOSamplePipe_H

-#define FIFOSamplePipe_H

+#pragma once

 #include <cassert>

 #include "STTypes.h"

@@ -215,5 +214,3 @@ public:

 };

 }

-

-#endif

@@ -82,7 +82,7 @@ public:

 	{

 		int oNumSamples = other.numSamples();

-		putSamples(other.ptrBegin(), oNumSamples);

+		this->putSamples(other.ptrBegin(), oNumSamples);

 		other.receiveSamples(oNumSamples);

 	};

@@ -17,10 +17,10 @@

 ///

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

 //

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

-// File revision : $Revision: 1.8 $

+// Last changed  : $Date: 2012-06-13 16:29:53 -0300 (qua, 13 jun 2012) $

+// File revision : $Revision: 4 $

 //

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

+// $Id: FIFOSamplePipe.h 143 2012-06-13 19:29:53Z oparviai $

 //

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

 //

@@ -49,7 +49,6 @@

 #define FIFOSamplePipe_H

 #include <cassert>

-#include <cstdlib>

 #include "STTypes.h"

 namespace soundtouch

@@ -59,6 +58,9 @@ namespace soundtouch

 class FIFOSamplePipe

 {

 public:

+	// virtual default destructor

+	virtual ~FIFOSamplePipe() { }

+

 	/// Returns a pointer to the beginning of the output samples.

 	/// This function is provided for accessing the output samples directly.

 	/// Please be careful for not to corrupt the book-keeping!

@@ -66,12 +68,12 @@ public:

 	/// When using this function to output samples, also remember to 'remove' the

 	/// output samples from the buffer by calling the

 	/// 'receiveSamples(numSamples)' function

-	virtual SAMPLETYPE *ptrBegin() const = 0;

+	virtual SAMPLETYPE *ptrBegin() = 0;

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

 	/// the sample buffer.

 	virtual void putSamples(const SAMPLETYPE *samples,  ///< Pointer to samples.

-                            uint32_t numSamples                         ///< Number of samples to insert.

+                            uint32_t numSamples         ///< Number of samples to insert.

                             ) = 0;

 	// Moves samples from the 'other' pipe instance to this instance.

@@ -109,6 +111,10 @@ public:

 	/// Clears all the samples.

 	virtual void clear() = 0;

+

+	/// allow trimming (downwards) amount of samples in pipeline.

+	/// Returns adjusted amount of samples

+	virtual uint32_t adjustAmountOfSamples(uint32_t numSamples) = 0;

 };

 /// Base-class for sound processing routines working in FIFO principle. With this base

@@ -128,23 +134,23 @@ protected:

 	/// Sets output pipe.

 	void setOutPipe(FIFOSamplePipe *pOutput)

 	{

-		assert(!output);

+		assert(!this->output);

 		assert(pOutput);

-		output = pOutput;

+		this->output = pOutput;

 	}

 	/// Constructor. Doesn't define output pipe; it has to be set be

 	/// 'setOutPipe' function.

 	FIFOProcessor()

 	{

-		output = NULL;

+		this->output = nullptr;

 	}

 	/// Constructor. Configures output pipe.

 	FIFOProcessor(FIFOSamplePipe *pOutput   ///< Output pipe.

                  )

 	{

-		output = pOutput;

+		this->output = pOutput;

 	}

 	/// Destructor.

@@ -159,9 +165,9 @@ protected:

 	/// When using this function to output samples, also remember to 'remove' the

 	/// output samples from the buffer by calling the

 	/// 'receiveSamples(numSamples)' function

-	virtual SAMPLETYPE *ptrBegin() const

+	virtual SAMPLETYPE *ptrBegin()

 	{

-		return output->ptrBegin();

+		return this->output->ptrBegin();

 	}

 public:

@@ -174,7 +180,7 @@ public:

                                 uint32_t maxSamples                    ///< How many samples to receive at max.

                                 )

 	{

-		return output->receiveSamples(outBuffer, maxSamples);

+		return this->output->receiveSamples(outBuffer, maxSamples);

 	}

 	/// Adjusts book-keeping so that given number of samples are removed from beginning of the

@@ -185,19 +191,26 @@ public:

 	virtual uint32_t receiveSamples(uint32_t maxSamples   ///< Remove this many samples from the beginning of pipe.

                                 )

 	{

-		return output->receiveSamples(maxSamples);

+		return this->output->receiveSamples(maxSamples);

 	}

 	/// Returns number of samples currently available.

 	virtual uint32_t numSamples() const

 	{

-		return output->numSamples();

+		return this->output->numSamples();

 	}

 	/// Returns nonzero if there aren't any samples available for outputting.

 	virtual bool isEmpty() const

 	{

-		return output->isEmpty();

+		return this->output->isEmpty();

+	}

+

+	/// allow trimming (downwards) amount of samples in pipeline.

+	/// Returns adjusted amount of samples

+	virtual uint32_t adjustAmountOfSamples(uint32_t numSamples)

+	{

+		return this->output->adjustAmountOfSamples(numSamples);

 	}

 };

new file mode 100644

@@ -0,0 +1,206 @@

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

+///

+/// 'FIFOSamplePipe' : An abstract base class for classes that manipulate sound

+/// samples by operating like a first-in-first-out pipe: New samples are fed

+/// into one end of the pipe with the 'putSamples' function, and the processed

+/// samples are received from the other end with the 'receiveSamples' function.

+///

+/// 'FIFOProcessor' : A base class for classes the do signal processing with

+/// the samples while operating like a first-in-first-out pipe. When samples

+/// are input with the 'putSamples' function, the class processes them

+/// and moves the processed samples to the given 'output' pipe object, which

+/// may be either another processing stage, or a fifo sample buffer object.

+///

+/// 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.8 $

+//

+// $Id: FIFOSamplePipe.h,v 1.8 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 FIFOSamplePipe_H

+#define FIFOSamplePipe_H

+

+#include <cassert>

+#include <cstdlib>

+#include "STTypes.h"

+

+namespace soundtouch

+{

+

+/// Abstract base class for FIFO (first-in-first-out) sample processing classes.

+class FIFOSamplePipe

+{

+public:

+	/// Returns a pointer to the beginning of the output samples.

+	/// This function is provided for accessing the output samples directly.

+	/// Please be careful for not to corrupt the book-keeping!

+	///

+	/// When using this function to output samples, also remember to 'remove' the

+	/// output samples from the buffer by calling the

+	/// 'receiveSamples(numSamples)' function

+	virtual SAMPLETYPE *ptrBegin() const = 0;

+

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

+	/// the sample buffer.

+	virtual void putSamples(const SAMPLETYPE *samples,  ///< Pointer to samples.

+                            uint32_t numSamples                         ///< Number of samples to insert.

+                            ) = 0;

+

+	// Moves samples from the 'other' pipe instance to this instance.

+	void moveSamples(FIFOSamplePipe &other  ///< Other pipe instance where from the receive the data.

+         )

+	{

+		int oNumSamples = other.numSamples();

+

+		putSamples(other.ptrBegin(), oNumSamples);

+		other.receiveSamples(oNumSamples);

+	};

+

+	/// Output samples from beginning of the sample buffer. Copies requested samples to

+	/// output buffer and removes them from the sample buffer. If there are less than

+	/// 'numsample' samples in the buffer, returns all that available.

+	///

+	/// \return Number of samples returned.

+	virtual uint32_t receiveSamples(SAMPLETYPE *output, ///< Buffer where to copy output samples.

+                                uint32_t maxSamples                 ///< How many samples to receive at max.

+                                ) = 0;

+

+	/// Adjusts book-keeping so that given number of samples are removed from beginning of the

+	/// sample buffer without copying them anywhere.

+	///

+	/// Used to reduce the number of samples in the buffer when accessing the sample buffer directly

+	/// with 'ptrBegin' function.

+	virtual uint32_t receiveSamples(uint32_t maxSamples   ///< Remove this many samples from the beginning of pipe.

+                                ) = 0;

+

+	/// Returns number of samples currently available.

+	virtual uint32_t numSamples() const = 0;

+

+	// Returns nonzero if there aren't any samples available for outputting.

+	virtual bool isEmpty() const = 0;

+

+	/// Clears all the samples.

+	virtual void clear() = 0;

+};

+

+/// Base-class for sound processing routines working in FIFO principle. With this base

+/// class it's easy to implement sound processing stages that can be chained together,

+/// so that samples that are fed into beginning of the pipe automatically go through

+/// all the processing stages.

+///

+/// When samples are input to this class, they're first processed and then put to

+/// the FIFO pipe that's defined as output of this class. This output pipe can be

+/// either other processing stage or a FIFO sample buffer.

+class FIFOProcessor :public FIFOSamplePipe

+{

+protected:

+	/// Internal pipe where processed samples are put.

+	FIFOSamplePipe *output;

+

+	/// Sets output pipe.

+	void setOutPipe(FIFOSamplePipe *pOutput)

+	{

+		assert(!output);

+		assert(pOutput);

+		output = pOutput;

+	}

+

+	/// Constructor. Doesn't define output pipe; it has to be set be

+	/// 'setOutPipe' function.

+	FIFOProcessor()

+	{

+		output = NULL;

+	}

+

+	/// Constructor. Configures output pipe.

+	FIFOProcessor(FIFOSamplePipe *pOutput   ///< Output pipe.

+                 )

+	{

+		output = pOutput;

+	}

+

+	/// Destructor.

+	virtual ~FIFOProcessor()

+	{

+	}

+

+	/// Returns a pointer to the beginning of the output samples.

+	/// This function is provided for accessing the output samples directly.

+	/// Please be careful for not to corrupt the book-keeping!

+	///

+	/// When using this function to output samples, also remember to 'remove' the

+	/// output samples from the buffer by calling the

+	/// 'receiveSamples(numSamples)' function

+	virtual SAMPLETYPE *ptrBegin() const

+	{

+		return output->ptrBegin();

+	}

+

+public:

+	/// Output samples from beginning of the sample buffer. Copies requested samples to

+	/// output buffer and removes them from the sample buffer. If there are less than

+	/// 'numsample' samples in the buffer, returns all that available.

+	///

+	/// \return Number of samples returned.

+	virtual uint32_t receiveSamples(SAMPLETYPE *outBuffer, ///< Buffer where to copy output samples.

+                                uint32_t maxSamples                    ///< How many samples to receive at max.

+                                )

+	{

+		return output->receiveSamples(outBuffer, maxSamples);

+	}

+

+	/// Adjusts book-keeping so that given number of samples are removed from beginning of the

+	/// sample buffer without copying them anywhere.

+	///

+	/// Used to reduce the number of samples in the buffer when accessing the sample buffer directly

+	/// with 'ptrBegin' function.

+	virtual uint32_t receiveSamples(uint32_t maxSamples   ///< Remove this many samples from the beginning of pipe.

+                                )

+	{

+		return output->receiveSamples(maxSamples);

+	}

+

+	/// Returns number of samples currently available.

+	virtual uint32_t numSamples() const

+	{

+		return output->numSamples();

+	}

+

+	/// Returns nonzero if there aren't any samples available for outputting.

+	virtual bool isEmpty() const

+	{

+		return output->isEmpty();

+	}

+};

+

+}

+

+#endif