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

[lordhoto at users.sourceforge.net]

Revision: 47638
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47638&view=rev
Author:   lordhoto
Date:     2010-01-28 10:08:54 +0000 (Thu, 28 Jan 2010)

Log Message:
-----------
Get rid of use of Audio::makeRawMemoryStream_OLD in SKY.

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

Modified: scummvm/trunk/engines/sky/sound.cpp
===================================================================
--- scummvm/trunk/engines/sky/sound.cpp	2010-01-28 10:04:54 UTC (rev 47637)
+++ scummvm/trunk/engines/sky/sound.cpp	2010-01-28 10:08:54 UTC (rev 47638)
@@ -1111,19 +1111,24 @@
 	uint32 dataLoop = READ_BE_UINT16(_sfxInfo + (sound << 3) + 6);
 	dataOfs += _sfxBaseOfs;
 
-	uint32 loopSta = 0, loopEnd = 0;
+	Audio::SeekableAudioStream *stream = Audio::makeRawMemoryStream(_soundData + dataOfs, dataSize, sampleRate,
+	                                                                Audio::FLAG_UNSIGNED, DisposeAfterUse::NO);
+
+	Audio::AudioStream *output = 0;
 	if (dataLoop) {
-		loopSta = dataSize - dataLoop;
-		loopEnd = dataSize;
+		uint32 loopSta = dataSize - dataLoop;
+		uint32 loopEnd = dataSize;
+
+		output = Audio::makeLoopingAudioStream(stream, Audio::Timestamp(0, loopSta, sampleRate),
+		                                       Audio::Timestamp(0, loopEnd, sampleRate), 0);
+	} else {
+		output = stream;
 	}
 
-	Audio::AudioStream *stream = Audio::makeRawMemoryStream_OLD(_soundData + dataOfs, dataSize, sampleRate,
-									Audio::FLAG_UNSIGNED, loopSta, loopEnd, DisposeAfterUse::NO);
-
 	if (channel == 0)
-		_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_ingameSound0, stream, SOUND_CH0, volume, 0);
+		_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_ingameSound0, output, SOUND_CH0, volume, 0);
 	else
-		_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_ingameSound1, stream, SOUND_CH1, volume, 0);
+		_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_ingameSound1, output, SOUND_CH1, volume, 0);
 }
 
 void Sound::fnStartFx(uint32 sound, uint8 channel) {


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