[Scummvm-cvs-logs] scummvm master -> 7143eaed892e6008a7eb09f058f54d794764f199

somaen einarjohants at gmail.com
Tue Jan 22 15:10:47 CET 2013


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7143eaed89 WINTERMUTE: Properly create WAV-substreams, (fix bug #3592165)


Commit: 7143eaed892e6008a7eb09f058f54d794764f199
    https://github.com/scummvm/scummvm/commit/7143eaed892e6008a7eb09f058f54d794764f199
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-01-22T06:10:01-08:00

Commit Message:
WINTERMUTE: Properly create WAV-substreams, (fix bug #3592165)

Changed paths:
    engines/wintermute/base/sound/base_sound_buffer.cpp



diff --git a/engines/wintermute/base/sound/base_sound_buffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp
index 250570f..e8f4fce 100644
--- a/engines/wintermute/base/sound/base_sound_buffer.cpp
+++ b/engines/wintermute/base/sound/base_sound_buffer.cpp
@@ -111,7 +111,7 @@ bool BaseSoundBuffer::loadFromFile(const Common::String &filename, bool forceRel
 		if (Audio::loadWAVFromStream(*_file, waveSize, waveRate, waveFlags, &waveType)) {
 			if (waveType == 1) {
 				// We need to wrap the file in a substream to make sure the size is right.
-				_file = new Common::SeekableSubReadStream(_file, 0, waveSize);
+				_file = new Common::SeekableSubReadStream(_file, _file->pos(), waveSize + _file->pos());
 				_stream = Audio::makeRawStream(_file, waveRate, waveFlags, DisposeAfterUse::YES);
 			} else {
 				error("BSoundBuffer::LoadFromFile - WAVE not supported yet for %s with type %d", filename.c_str(), waveType);






More information about the Scummvm-git-logs mailing list