From 4e849092d23689f7a82f834e51279401b4349893 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Wed, 24 Aug 2011 09:52:41 -0400
Subject: AUDIO: Add a DisposeAfterUse parameter to makeXAStream

---
 audio/decoders/xa.cpp | 13 ++++++++-----
 audio/decoders/xa.h   |  6 +++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'audio/decoders')

diff --git a/audio/decoders/xa.cpp b/audio/decoders/xa.cpp
index 2b8c9b2d99..9871775973 100644
--- a/audio/decoders/xa.cpp
+++ b/audio/decoders/xa.cpp
@@ -28,7 +28,7 @@ namespace Audio {
 
 class XAStream : public Audio::RewindableAudioStream {
 public:
-	XAStream(Common::SeekableReadStream *stream, int rate);
+	XAStream(Common::SeekableReadStream *stream, int rate, DisposeAfterUse::Flag disposeAfterUse);
 	~XAStream();
 
 	bool isStereo() const { return false; }
@@ -39,6 +39,7 @@ public:
 	bool rewind();
 private:
 	Common::SeekableReadStream *_stream;
+	DisposeAfterUse::Flag _disposeAfterUse;
 
 	byte _predictor;
 	double _samples[28];
@@ -47,7 +48,8 @@ private:
 	double _s1, _s2;
 };
 
-XAStream::XAStream(Common::SeekableReadStream *stream, int rate) : _stream(stream) {
+XAStream::XAStream(Common::SeekableReadStream *stream, int rate, DisposeAfterUse::Flag disposeAfterUse)
+		: _stream(stream), _disposeAfterUse(disposeAfterUse) {
 	_samplesRemaining = 0;
 	_predictor = 0;
 	_s1 = _s2 = 0.0;
@@ -56,7 +58,8 @@ XAStream::XAStream(Common::SeekableReadStream *stream, int rate) : _stream(strea
 
 
 XAStream::~XAStream() {
-	delete _stream;
+	if (_disposeAfterUse == DisposeAfterUse::YES)
+		delete _stream;
 }
 
 static const double s_xaDataTable[5][2] =
@@ -140,8 +143,8 @@ bool XAStream::rewind() {
 	return true;
 }
 
-RewindableAudioStream *makeXAStream(Common::SeekableReadStream *stream, int rate) {
-	return new XAStream(stream, rate);
+RewindableAudioStream *makeXAStream(Common::SeekableReadStream *stream, int rate, DisposeAfterUse::Flag disposeAfterUse) {
+	return new XAStream(stream, rate, disposeAfterUse);
 }
 
 } // End of namespace Audio
diff --git a/audio/decoders/xa.h b/audio/decoders/xa.h
index 68c07151da..cf28d8001a 100644
--- a/audio/decoders/xa.h
+++ b/audio/decoders/xa.h
@@ -31,6 +31,8 @@
 #ifndef AUDIO_DECODERS_XA_H
 #define AUDIO_DECODERS_XA_H
 
+#include "common/types.h"
+
 namespace Common {
 class SeekableReadStream;
 }
@@ -45,11 +47,13 @@ class RewindableAudioStream;
  *
  * @param stream            the SeekableReadStream from which to read the XA ADPCM data
  * @param rate              the sampling rate
+ * @param disposeAfterUse   whether to delete the stream after use.
  * @return   a new RewindableAudioStream, or NULL, if an error occurred
  */
 RewindableAudioStream *makeXAStream(
 	Common::SeekableReadStream *stream,
-	int rate);
+	int rate,
+	DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES);
 
 } // End of namespace Audio
 
-- 
cgit v1.2.3