[Scummvm-cvs-logs] SF.net SVN: scummvm:[48880] scummvm/trunk/engines/sci

[m_kiewitz at users.sourceforge.net]

Revision: 48880
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48880&view=rev
Author:   m_kiewitz
Date:     2010-05-01 14:04:48 +0000 (Sat, 01 May 2010)

Log Message:
-----------
SCI: fix bugs in audio decompression (mp3, ogg, flac)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/resource.cpp
    scummvm/trunk/engines/sci/sound/audio.cpp

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-05-01 12:55:32 UTC (rev 48879)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-05-01 14:04:48 UTC (rev 48880)
@@ -285,8 +285,8 @@
 		uint32 recordCount = file->readUint32LE();
 		if (!recordCount)
 			error("compressed audio volume doesn't contain any entries!");
-		source->audioCompressionOffsetMapping = new int32[(recordCount + 1) * 4 * 2];
-		file->read(&source->audioCompressionOffsetMapping, recordCount * 4 * 2);
+		source->audioCompressionOffsetMapping = new int32[(recordCount + 1) * 2];
+		file->read(source->audioCompressionOffsetMapping, recordCount * 4 * 2);
 		// Put ending zero
 		source->audioCompressionOffsetMapping[recordCount * 2] = 0;
 		source->audioCompressionOffsetMapping[recordCount * 2 + 1] = file->size();

Modified: scummvm/trunk/engines/sci/sound/audio.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/audio.cpp	2010-05-01 12:55:32 UTC (rev 48879)
+++ scummvm/trunk/engines/sci/sound/audio.cpp	2010-05-01 14:04:48 UTC (rev 48880)
@@ -236,17 +236,17 @@
 		switch (audioCompressionType) {
 		case MKID_BE('MP3 '):
 #ifdef USE_MAD
-			audioStream = Audio::makeMP3Stream(compressedStream, DisposeAfterUse::YES);
+			audioStream = Audio::makeMP3Stream(compressedStream, DisposeAfterUse::NO);
 #endif
 			break;
 		case MKID_BE('OGG '):
 #ifdef USE_VORBIS
-			audioStream = Audio::makeVorbisStream(compressedStream, DisposeAfterUse::YES);
+			audioStream = Audio::makeVorbisStream(compressedStream, DisposeAfterUse::NO);
 #endif
 			break;
 		case MKID_BE('FLAC'):
 #ifdef USE_FLAC
-			audioStream = Audio::makeFLACStream(compressedStream, DisposeAfterUse::YES);
+			audioStream = Audio::makeFLACStream(compressedStream, DisposeAfterUse::NO);
 #endif
 			break;
 		}


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