From e59e65aa993a7af0bedf03e5d3e2b3cfade64fc5 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Mon, 18 May 2009 10:40:22 +0000
Subject: Fix crash when any movie is played in the Macintosh version of The
 Feebles Files, a regression caused by revision 36085.

svn-id: r40679
---
 sound/wave.cpp | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/sound/wave.cpp b/sound/wave.cpp
index af7405418e..76ba5178a5 100644
--- a/sound/wave.cpp
+++ b/sound/wave.cpp
@@ -176,16 +176,27 @@ AudioStream *makeWAVStream(Common::SeekableReadStream *stream, bool disposeAfter
 	}
 
 	if (type == 17) { // MS IMA ADPCM
-		return Audio::makeADPCMStream(stream, disposeAfterUse, size, Audio::kADPCMMSIma, rate, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1, blockAlign);
+		Audio::AudioStream *sndStream = Audio::makeADPCMStream(stream, false, size, Audio::kADPCMMSIma, rate, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1, blockAlign);
+		data = (byte *)malloc(size * 4);
+		assert(data);
+		size = sndStream->readBuffer((int16*)data, size * 2);
+		size *= 2; // 16bits.
+		delete sndStream;
 	} else if (type == 2) { // MS ADPCM
-		return Audio::makeADPCMStream(stream, disposeAfterUse, size, Audio::kADPCMMS, rate, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1, blockAlign);
+		Audio::AudioStream *sndStream = Audio::makeADPCMStream(stream, false, size, Audio::kADPCMMS, rate, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1, blockAlign);
+		data = (byte *)malloc(size * 4);
+		assert(data);
+		size = sndStream->readBuffer((int16*)data, size * 2);
+		size *= 2; // 16bits.
+		delete sndStream;
+	} else {
+		// Plain data. Just read everything at once.
+		// TODO: More elegant would be to wrap the stream.
+		data = (byte *)malloc(size);
+		assert(data);
+		stream->read(data, size);
 	}
 
-	// Plain data. Just read everything at once.
-	// TODO: More elegant would be to wrap the stream.
-	data = (byte *)malloc(size);
-	assert(data);
-	stream->read(data, size);
 	if (disposeAfterUse)
 		delete stream;
 
-- 
cgit v1.2.3