[Scummvm-cvs-logs] SF.net SVN: scummvm:[45101] scummvm/trunk/engines/tucker/resource.cpp

[fingolfin at users.sourceforge.net]

Revision: 45101
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45101&view=rev
Author:   fingolfin
Date:     2009-10-14 23:30:06 +0000 (Wed, 14 Oct 2009)

Log Message:
-----------
TUCKER: Convert one more loadWAVFromStream instance to makeWAVStream

Modified Paths:
--------------
    scummvm/trunk/engines/tucker/resource.cpp

Modified: scummvm/trunk/engines/tucker/resource.cpp
===================================================================
--- scummvm/trunk/engines/tucker/resource.cpp	2009-10-14 23:29:14 UTC (rev 45100)
+++ scummvm/trunk/engines/tucker/resource.cpp	2009-10-14 23:30:06 UTC (rev 45101)
@@ -943,21 +943,11 @@
 		}
 		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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.