From d4d1346ceba02d0d24b364a8295c85dd967116b6 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 14 Oct 2009 23:30:06 +0000
Subject: TUCKER: Convert one more loadWAVFromStream instance to makeWAVStream

svn-id: r45101
---
 engines/tucker/resource.cpp | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'engines/tucker')

diff --git a/engines/tucker/resource.cpp b/engines/tucker/resource.cpp
index f22061468c..43fe9cabd3 100644
--- a/engines/tucker/resource.cpp
+++ b/engines/tucker/resource.cpp
@@ -943,21 +943,11 @@ void TuckerEngine::loadSound(Audio::Mixer::SoundType type, int num, int volume,
 		}
 		char fileName[64];
 		snprintf(fileName, sizeof(fileName), fmt, num);
-		Common::File f;
-		if (f.open(fileName)) {
-			int size, rate;
-			uint8 flags = 0;
-			if (Audio::loadWAVFromStream(f, size, rate, flags)) {
-				uint8 *data = (uint8 *)malloc(size);
-				if (data) {
-					f.read(data, size);
-					flags |= Audio::Mixer::FLAG_AUTOFREE;
-					if (loop) {
-						flags |= Audio::Mixer::FLAG_LOOP;
-					}
-					stream = Audio::makeLinearInputStream(data, size, rate, flags, 0, 0);
-				}
-			}
+		Common::File *f = new Common::File;
+		if (f->open(fileName)) {
+			stream = Audio::makeWAVStream(f, true, loop);
+		} else {
+			delete f;
 		}
 	}
 	if (stream) {
-- 
cgit v1.2.3