Reorder params to Audio::makeRawMemoryStream

svn-id: r47492

8 files changed, 25 insertions, 20 deletions

diff --git a/sound/aiff.cpp b/sound/aiff.cpp
index ec47eaa1f8..6f0e943ac3 100644
--- a/sound/aiff.cpp
+++ b/sound/aiff.cpp
@@ -173,7 +173,7 @@ SeekableAudioStream *makeAIFFStream(Common::SeekableReadStream &stream) {
 	stream.read(data, size);
 
 	// Since we allocated our own buffer for the data, we must specify DisposeAfterUse::YES.
-	return makeRawMemoryStream(data, size, DisposeAfterUse::YES, rate, flags);
+	return makeRawMemoryStream(data, size, rate, flags);
 }
 
 } // End of namespace Audio
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp
index d685de1afe..01c4aefec0 100644
--- a/sound/audiostream.cpp
+++ b/sound/audiostream.cpp
@@ -253,7 +253,7 @@ bool SubSeekableAudioStream::seek(const Timestamp &where) {
 
 
 void QueuingAudioStream::queueBuffer(byte *data, uint32 size, DisposeAfterUse::Flag disposeAfterUse, byte flags) {
-	AudioStream *stream = makeRawMemoryStream(data, size, disposeAfterUse, getRate(), flags);
+	AudioStream *stream = makeRawMemoryStream(data, size, getRate(), flags, disposeAfterUse);
 	queueAudioStream(stream, DisposeAfterUse::YES);
 }
 
diff --git a/sound/iff_sound.cpp b/sound/iff_sound.cpp
index 2ec97d005b..9a254cd593 100644
--- a/sound/iff_sound.cpp
+++ b/sound/iff_sound.cpp
@@ -108,7 +108,7 @@ AudioStream *make8SVXStream(Common::ReadStream &input, bool loop) {
 	A8SVXLoader loader;
 	loader.load(input);
 
-	SeekableAudioStream *stream = Audio::makeRawMemoryStream((byte *)loader._data, loader._dataSize, DisposeAfterUse::YES, loader._header.samplesPerSec, 0);
+	SeekableAudioStream *stream = Audio::makeRawMemoryStream((byte *)loader._data, loader._dataSize, loader._header.samplesPerSec, 0);
 
 	uint32 loopStart = 0, loopEnd = 0;
 	if (loop) {
diff --git a/sound/raw.cpp b/sound/raw.cpp
index dae38daeb1..1288d826b5 100644
--- a/sound/raw.cpp
+++ b/sound/raw.cpp
@@ -329,8 +329,9 @@ bool RawDiskStream<stereo, is16Bit, isUnsigned, isLE>::seek(const Timestamp &whe
 			return new RawMemoryStream<STEREO, false, UNSIGNED, false>(rate, ptr, len, autoFree)
 
 SeekableAudioStream *makeRawMemoryStream(const byte *ptr, uint32 len,
-		DisposeAfterUse::Flag autoFree,
-		int rate, byte flags) {
+		int rate, byte flags,
+		DisposeAfterUse::Flag autoFree
+		) {
 	const bool isStereo   = (flags & Audio::FLAG_STEREO) != 0;
 	const bool is16Bit    = (flags & Audio::FLAG_16BITS) != 0;
 	const bool isUnsigned = (flags & Audio::FLAG_UNSIGNED) != 0;
@@ -360,10 +361,11 @@ SeekableAudioStream *makeRawMemoryStream(const byte *ptr, uint32 len,
 
 
 AudioStream *makeRawMemoryStream_OLD(const byte *ptr, uint32 len,
-		DisposeAfterUse::Flag autoFree,
 		int rate, byte flags,
-		uint loopStart, uint loopEnd) {
-	SeekableAudioStream *s = makeRawMemoryStream(ptr, len, autoFree, rate, flags);
+		uint loopStart, uint loopEnd,
+		DisposeAfterUse::Flag autoFree
+	) {
+	SeekableAudioStream *s = makeRawMemoryStream(ptr, len, rate, flags, autoFree);
 
 	if (loopStart != loopEnd) {
 		const bool isStereo   = (flags & Audio::FLAG_STEREO) != 0;
diff --git a/sound/raw.h b/sound/raw.h
index bd54f55676..6ea8c5a92e 100644
--- a/sound/raw.h
+++ b/sound/raw.h
@@ -70,16 +70,18 @@ enum RawFlags {
  * then this buffer will be deallocated using free(). So do not
  * use a buffer allocated with new[]!
  *
- * @param ptr Data
- * @param len Length of the data (in bytes!)
- * @param rate The sample rate of the data.
- * @param flags Flags combination.
+ * @param ptr 	pointer to a buffer containing audio data
+ * @param len	length of the buffer in bytes
+ * @param rate	sample rate of the data
+ * @param flags	audio format flags combination
  * @see Mixer::RawFlags
+ * @param autofreeBuffer	whether the data buffer should be destroyed after playback
  * @return The new SeekableAudioStream (or 0 on failure).
  */
 SeekableAudioStream *makeRawMemoryStream(const byte *ptr, uint32 len,
-		DisposeAfterUse::Flag autofreeBuffer,
-		int rate, byte flags);
+		int rate, byte flags,
+		DisposeAfterUse::Flag autofreeBuffer = DisposeAfterUse::YES
+		);
 
 /**
  * NOTE:
@@ -93,9 +95,10 @@ SeekableAudioStream *makeRawMemoryStream(const byte *ptr, uint32 len,
  * of the data.
  */
 AudioStream *makeRawMemoryStream_OLD(const byte *ptr, uint32 len,
-		DisposeAfterUse::Flag autofreeBuffer,
 		int rate, byte flags,
-		uint loopStart, uint loopEnd);
+		uint loopStart, uint loopEnd,
+		DisposeAfterUse::Flag autofreeBuffer = DisposeAfterUse::YES
+		);
 
 
 /**
diff --git a/sound/shorten.cpp b/sound/shorten.cpp
index eeaac5ae98..c3893ebc0a 100644
--- a/sound/shorten.cpp
+++ b/sound/shorten.cpp
@@ -524,7 +524,7 @@ AudioStream *makeShortenStream(Common::SeekableReadStream &stream) {
 		return 0;
 
 	// Since we allocated our own buffer for the data, we must specify DisposeAfterUse::YES.
-	return makeRawMemoryStream(data, size, DisposeAfterUse::YES, rate, flags);
+	return makeRawMemoryStream(data, size, rate, flags);
 }
 
 } // End of namespace Audio
diff --git a/sound/voc.cpp b/sound/voc.cpp
index a5e5096ad3..344825eddd 100644
--- a/sound/voc.cpp
+++ b/sound/voc.cpp
@@ -353,7 +353,7 @@ AudioStream *makeVOCStream(Common::SeekableReadStream &stream, byte flags, uint
 	if (!data)
 		return 0;
 
-	return makeRawMemoryStream_OLD(data, size, DisposeAfterUse::YES, rate, flags, loopStart, loopEnd);
+	return makeRawMemoryStream_OLD(data, size, rate, flags, loopStart, loopEnd);
 #endif
 }
 
@@ -368,7 +368,7 @@ SeekableAudioStream *makeVOCStream(Common::SeekableReadStream &stream, byte flag
 	if (!data)
 		return 0;
 
-	return makeRawMemoryStream(data, size, DisposeAfterUse::YES, rate, flags);
+	return makeRawMemoryStream(data, size, rate, flags);
 #endif
 }
 
diff --git a/sound/wave.cpp b/sound/wave.cpp
index 018cbd2133..88ab967f23 100644
--- a/sound/wave.cpp
+++ b/sound/wave.cpp
@@ -189,7 +189,7 @@ RewindableAudioStream *makeWAVStream(Common::SeekableReadStream *stream, Dispose
 		delete stream;
 
 	// Since we allocated our own buffer for the data, we must specify DisposeAfterUse::YES.
-	return makeRawMemoryStream(data, size, DisposeAfterUse::YES, rate, flags);
+	return makeRawMemoryStream(data, size, rate, flags);
 }
 
 } // End of namespace Audio