Replace AppendableAudioStream by QueuingAudioStream

svn-id: r47189

1 files changed, 1 insertions, 164 deletions

diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp
index 6d7ee24738..72f01b35d1 100644
--- a/sound/audiostream.cpp
+++ b/sound/audiostream.cpp
@@ -26,7 +26,6 @@
 #include "common/debug.h"
 #include "common/endian.h"
 #include "common/file.h"
-#include "common/list.h"
 #include "common/queue.h"
 #include "common/util.h"
 
@@ -604,171 +603,9 @@ SeekableAudioStream *makeLinearDiskStream(Common::SeekableReadStream *stream, Li
 }
 
 
-#pragma mark -
-#pragma mark --- Appendable audio stream ---
-#pragma mark -
-
-struct Buffer {
-	byte *start;
-	byte *end;
-};
-
-/**
- * Wrapped memory stream.
- */
-class BaseAppendableMemoryStream : public AppendableAudioStream {
-protected:
-
-	/**
-	 * A mutex to avoid access problems (causing e.g. corruption of
-	 * the linked list) in thread aware environments.
-	 */
-	Common::Mutex _mutex;
-
-	// List of all queued buffers
-	Common::List<Buffer> _bufferQueue;
-
-	bool _finalized;
-	const int _rate;
-	// Position in the front buffer, if any
-	byte *_pos;
-
-	inline bool eosIntern() const { return _bufferQueue.empty(); };
-public:
-	BaseAppendableMemoryStream(int rate);
-	~BaseAppendableMemoryStream();
-
-	bool endOfStream() const	{ return _finalized && eosIntern(); }
-	bool endOfData() const		{ return eosIntern(); }
-
-	int getRate() const			{ return _rate; }
-
-	void finish()				{ _finalized = true; }
-
-	void queueBuffer(byte *data, uint32 size);
-};
-
-/**
- * Wrapped memory stream.
- */
-template<bool stereo, bool is16Bit, bool isUnsigned, bool isLE>
-class AppendableMemoryStream : public BaseAppendableMemoryStream {
-public:
-	AppendableMemoryStream(int rate) : BaseAppendableMemoryStream(rate) {}
-
-	bool isStereo() const		{ return stereo; }
-
-	int readBuffer(int16 *buffer, const int numSamples);
-};
-
-BaseAppendableMemoryStream::BaseAppendableMemoryStream(int rate)
- : _finalized(false), _rate(rate), _pos(0) {
-
-}
-
-BaseAppendableMemoryStream::~BaseAppendableMemoryStream() {
-	// Clear the queue
-	Common::List<Buffer>::iterator iter;
-	for (iter = _bufferQueue.begin(); iter != _bufferQueue.end(); ++iter)
-		delete[] iter->start;
-}
-
-template<bool stereo, bool is16Bit, bool isUnsigned, bool isLE>
-int AppendableMemoryStream<stereo, is16Bit, isUnsigned, isLE>::readBuffer(int16 *buffer, const int numSamples) {
-	Common::StackLock lock(_mutex);
-	int samples = numSamples;
-	while (samples > 0 && !eosIntern()) {
-		Buffer buf = *_bufferQueue.begin();
-		if (_pos == 0)
-			_pos = buf.start;
-
-		assert(buf.start <= _pos && _pos <= buf.end);
-		const int samplesLeftInCurBuffer = buf.end - _pos;
-		if (samplesLeftInCurBuffer == 0) {
-			delete[] buf.start;
-			_bufferQueue.erase(_bufferQueue.begin());
-			_pos = 0;
-			continue;
-		}
-
-		int len = MIN(samples, samplesLeftInCurBuffer / (is16Bit ? 2 : 1));
-		samples -= len;
-		do {
-			*buffer++ = READ_ENDIAN_SAMPLE(is16Bit, isUnsigned, _pos, isLE);
-			_pos += (is16Bit ? 2 : 1);
-		} while (--len);
-	}
-
-	return numSamples - samples;
-}
-
-void BaseAppendableMemoryStream::queueBuffer(byte *data, uint32 size) {
-	Common::StackLock lock(_mutex);
-
-/*
-	// Verify the buffer size is sane
-	if (is16Bit && stereo) {
-		assert((size & 3) == 0);
-	} else if (is16Bit || stereo) {
-		assert((size & 1) == 0);
-	}
-*/
-	// Verify that the stream has not yet been finalized (by a call to finish())
-	assert(!_finalized);
-
-	// Queue the buffer
-	Buffer buf = {data, data+size};
-	_bufferQueue.push_back(buf);
-
-
-#if 0
-	// Output some stats
-	uint totalSize = 0;
-	Common::List<Buffer>::iterator iter;
-	for (iter = _bufferQueue.begin(); iter != _bufferQueue.end(); ++iter)
-		totalSize += iter->end - iter->start;
-	printf("AppendableMemoryStream::queueBuffer: added a %d byte buf, a total of %d bytes are queued\n",
-				size, totalSize);
-#endif
-}
-
-
-#define MAKE_WRAPPED(STEREO, UNSIGNED) \
-		if (is16Bit) { \
-			if (isLE) \
-				return new AppendableMemoryStream<STEREO, true, UNSIGNED, true>(rate); \
-			else  \
-				return new AppendableMemoryStream<STEREO, true, UNSIGNED, false>(rate); \
-		} else \
-			return new AppendableMemoryStream<STEREO, false, UNSIGNED, false>(rate)
-
-AppendableAudioStream *makeAppendableAudioStream(int rate, byte _flags) {
-	const bool isStereo = (_flags & Mixer::FLAG_STEREO) != 0;
-	const bool is16Bit = (_flags & Mixer::FLAG_16BITS) != 0;
-	const bool isUnsigned = (_flags & Mixer::FLAG_UNSIGNED) != 0;
-	const bool isLE       = (_flags & Mixer::FLAG_LITTLE_ENDIAN) != 0;
-
-	if (isStereo) {
-		if (isUnsigned) {
-			MAKE_WRAPPED(true, true);
-		} else {
-			MAKE_WRAPPED(true, false);
-		}
-	} else {
-		if (isUnsigned) {
-			MAKE_WRAPPED(false, true);
-		} else {
-			MAKE_WRAPPED(false, false);
-		}
-	}
-}
-
-
-
-
 
 #pragma mark -
-#pragma mark --- Appendable audio stream ---
+#pragma mark --- Queueing audio stream ---
 #pragma mark -