[Scummvm-cvs-logs] SF.net SVN: scummvm:[36186] scummvm/trunk/engines/kyra/sound.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sun Feb 1 21:53:30 CET 2009


Revision: 36186
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36186&view=rev
Author:   lordhoto
Date:     2009-02-01 20:53:30 +0000 (Sun, 01 Feb 2009)

Log Message:
-----------
- Fixed mismatching new[] / free.
- Fixed bad casting

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sound.cpp

Modified: scummvm/trunk/engines/kyra/sound.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound.cpp	2009-02-01 20:52:53 UTC (rev 36185)
+++ scummvm/trunk/engines/kyra/sound.cpp	2009-02-01 20:53:30 UTC (rev 36186)
@@ -125,12 +125,14 @@
 	Audio::AppendableAudioStream *out = Audio::makeAppendableAudioStream(22050, Audio::Mixer::FLAG_AUTOFREE | Audio::Mixer::FLAG_UNSIGNED);
 	
 	for (Common::List<const char*>::iterator i = fileList.begin(); i != fileList.end(); i++) {
-		int size;
-		int rate;
-		uint8 *file = _vm->resource()->fileData(*i, (uint32*)&size);
-		Common::MemoryReadStream vocStream(file, (uint32)size);
+		uint32 fileSize = 0;
+		uint8 *file = _vm->resource()->fileData(*i, &fileSize);
+		Common::MemoryReadStream vocStream(file, fileSize, true);
+
+		int size, rate;
 		uint8 *data = Audio::loadVOCFromStream(vocStream, size, rate);
-		out->queueBuffer(data, size);		
+		out->queueBuffer(data, size);
+		delete[] file;
 	}
 	out->finish();
 	


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




More information about the Scummvm-git-logs mailing list