[Scummvm-cvs-logs] SF.net SVN: scummvm:[47722] scummvm/trunk/engines/scumm

[lordhoto at users.sourceforge.net]

Revision: 47722
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47722&view=rev
Author:   lordhoto
Date:     2010-01-30 18:15:17 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Use SubLoopingAudioStream instead of makeLoopingAudioStream in SCUMM. (Incorrect replacement introduced with r47715, thanks to Max for spotting this).

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/player_mod.cpp
    scummvm/trunk/engines/scumm/sound.cpp

Modified: scummvm/trunk/engines/scumm/player_mod.cpp
===================================================================
--- scummvm/trunk/engines/scumm/player_mod.cpp	2010-01-30 15:38:31 UTC (rev 47721)
+++ scummvm/trunk/engines/scumm/player_mod.cpp	2010-01-30 18:15:17 UTC (rev 47722)
@@ -97,7 +97,11 @@
 	_channels[i].ctr = 0;
 
 	Audio::SeekableAudioStream *stream = Audio::makeRawStream((const byte *)data, size, rate, 0);
-	_channels[i].input = Audio::makeLoopingAudioStream(stream, Audio::Timestamp(0, loopStart, rate), Audio::Timestamp(0, loopEnd, rate), loopStart == loopEnd ? 1 : 0);
+	if (loopStart != loopEnd) {
+		_channels[i].input = new Audio::SubLoopingAudioStream(stream, 0, Audio::Timestamp(0, loopStart, rate), Audio::Timestamp(0, loopEnd, rate));
+	} else {
+		_channels[i].input = stream;
+	}
 
 	// read the first sample
 	_channels[i].input->readBuffer(&_channels[i].pos, 1);

Modified: scummvm/trunk/engines/scumm/sound.cpp
===================================================================
--- scummvm/trunk/engines/scumm/sound.cpp	2010-01-30 15:38:31 UTC (rev 47721)
+++ scummvm/trunk/engines/scumm/sound.cpp	2010-01-30 18:15:17 UTC (rev 47722)
@@ -350,7 +350,7 @@
 				size -= waveSize;
 
 				Audio::SeekableAudioStream *s = Audio::makeRawStream(sound, waveSize, rate, Audio::FLAG_UNSIGNED);
-				stream = Audio::makeLoopingAudioStream(s, Audio::Timestamp(0, loopStart, rate), Audio::Timestamp(0, loopEnd, rate), 0);
+				stream = new Audio::SubLoopingAudioStream(s, 0, Audio::Timestamp(0, loopStart, rate), Audio::Timestamp(0, loopEnd, rate));
 				_mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID, 255, 0);
 			}
 			break;
@@ -441,7 +441,7 @@
 
 			// TODO: Currently we will only ever play till "loopEnd", even when we only have
 			// a finite repetition count.
-			stream = Audio::makeLoopingAudioStream(plainStream, Audio::Timestamp(0, loopStart, rate), Audio::Timestamp(0, loopEnd, rate), loopcount == 255 ? 0 : loopcount);
+			stream = new Audio::SubLoopingAudioStream(plainStream, loopcount == 255 ? 0 : loopcount, Audio::Timestamp(0, loopStart, rate), Audio::Timestamp(0, loopEnd, rate));
 		} else {
 			stream = plainStream;
 		}


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