[Scummvm-cvs-logs] SF.net SVN: scummvm:[45532] scummvm/branches/branch-1-0-0/engines/sword2/ sound.cpp

[fingolfin at users.sourceforge.net]

Revision: 45532
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45532&view=rev
Author:   fingolfin
Date:     2009-10-30 10:13:44 +0000 (Fri, 30 Oct 2009)

Log Message:
-----------
Reverting accidentally commited change

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/sword2/sound.cpp

Modified: scummvm/branches/branch-1-0-0/engines/sword2/sound.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/sword2/sound.cpp	2009-10-30 10:09:05 UTC (rev 45531)
+++ scummvm/branches/branch-1-0-0/engines/sword2/sound.cpp	2009-10-30 10:13:44 UTC (rev 45532)
@@ -330,15 +330,14 @@
 	if (_vm->_mixer->isSoundHandleActive(*handle))
 		return RDERR_FXALREADYOPEN;
 
+	Common::MemoryReadStream *stream = new Common::MemoryReadStream(data, len);
+	int rate, size;
+	byte flags;
+
 	if (Sword2Engine::isPsx()) {
-		Common::MemoryReadStream *stream = new Common::MemoryReadStream(data, len);
 		_vm->_mixer->playInputStream(soundType, handle, new Audio::VagStream(stream, loop), -1, vol, pan, true, false, isReverseStereo());
 	} else {
-		Common::MemoryReadStream stream(data, len);
-		int rate, size;
-		byte flags;
-	
-		if (!Audio::loadWAVFromStream(stream, size, rate, flags)) {
+		if (!Audio::loadWAVFromStream(*stream, size, rate, flags)) {
 			warning("playFX: Not a valid WAV file");
 			return RDERR_INVALIDWAV;
 		}
@@ -349,7 +348,7 @@
 		if (loop)
 			flags |= Audio::Mixer::FLAG_LOOP;
 
-		_vm->_mixer->playRaw(soundType, handle, data + stream.pos(), size, rate, flags, -1, vol, pan, 0, 0);
+		_vm->_mixer->playRaw(soundType, handle, data + stream->pos(), size, rate, flags, -1, vol, pan, 0, 0);
 	}
 
 	return RD_OK;


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