[Scummvm-cvs-logs] scummvm master -> 2f4f7d480e740c0f10816011f8e9876f29f875fd

[somaen]

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

Summary:
64695b5624 WINTERMUTE: Use SubLoopingAudio for music w/arbitrary loop points
2f4f7d480e Merge pull request #514 from tobiatesan/fix_audio_loop


Commit: 64695b56245e786b46d351c52572595adf3a310c
    https://github.com/scummvm/scummvm/commit/64695b56245e786b46d351c52572595adf3a310c
Author: Tobia Tesan (tobia.tesan at gmail.com)
Date: 2014-10-04T20:32:11+02:00

Commit Message:
WINTERMUTE: Use SubLoopingAudio for music w/arbitrary loop points

Should fix #6648 (music not looping correctly in 5MA)

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 7ec68ea..73287c9 100644
--- a/engines/wintermute/base/sound/base_sound_buffer.cpp
+++ b/engines/wintermute/base/sound/base_sound_buffer.cpp
@@ -143,8 +143,13 @@ bool BaseSoundBuffer::play(bool looping, uint32 startSample) {
 		_stream->seek(startSample);
 		_handle = new Audio::SoundHandle;
 		if (_looping) {
-			Audio::AudioStream *loopStream = new Audio::LoopingAudioStream(_stream, 0, DisposeAfterUse::NO);
-			g_system->getMixer()->playStream(_type, _handle, loopStream, -1, _volume, _pan, DisposeAfterUse::YES);
+			if (_loopStart != 0) {
+				Audio::AudioStream *loopStream = new Audio::SubLoopingAudioStream(_stream, 0, Audio::Timestamp(_loopStart, _stream->getRate()), _stream->getLength(), DisposeAfterUse::NO);
+				g_system->getMixer()->playStream(_type, _handle, loopStream, -1, _volume, _pan, DisposeAfterUse::YES);
+			} else {
+				Audio::AudioStream *loopStream = new Audio::LoopingAudioStream(_stream, 0, DisposeAfterUse::NO);
+				g_system->getMixer()->playStream(_type, _handle, loopStream, -1, _volume, _pan, DisposeAfterUse::YES);
+			}
 		} else {
 			g_system->getMixer()->playStream(_type, _handle, _stream, -1, _volume, _pan, DisposeAfterUse::NO);
 		}


Commit: 2f4f7d480e740c0f10816011f8e9876f29f875fd
    https://github.com/scummvm/scummvm/commit/2f4f7d480e740c0f10816011f8e9876f29f875fd
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2014-10-04T20:34:16+02:00

Commit Message:
Merge pull request #514 from tobiatesan/fix_audio_loop

WINTERMUTE: Use SubLoopingAudio for music w/arbitrary loop points

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