diff options
| author | Max Horn | 2007-11-16 10:05:18 +0000 |
|---|---|---|
| committer | Max Horn | 2007-11-16 10:05:18 +0000 |
| commit | c8ce5b1865c3854eca79843e12493453c7566d0b (patch) | |
| tree | 4b2da4ab38219679ab0cddafe68f686b46fd5a67 /engines | |
| parent | ca2641b70f96f879352ab49b5d4f90909d4f75de (diff) | |
| download | scummvm-rg350-c8ce5b1865c3854eca79843e12493453c7566d0b.tar.gz scummvm-rg350-c8ce5b1865c3854eca79843e12493453c7566d0b.tar.bz2 scummvm-rg350-c8ce5b1865c3854eca79843e12493453c7566d0b.zip | |
Changed Audio::makeADPCMStream so that the stream passed to it can automatically be disposed
svn-id: r29517
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/agos/sound.cpp | 2 | ||||
| -rw-r--r-- | engines/saga/sndres.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/sound_he.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp index e198fe8d66..2da81d2d28 100644 --- a/engines/agos/sound.cpp +++ b/engines/agos/sound.cpp @@ -741,7 +741,7 @@ void Sound::playSoundData(Audio::SoundHandle *handle, byte *soundData, uint soun flags |= Audio::Mixer::FLAG_LOOP; if (compType == 2) { - Audio::AudioStream *sndStream = Audio::makeADPCMStream(&stream, size, Audio::kADPCMMS, rate, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1, blockAlign); + Audio::AudioStream *sndStream = Audio::makeADPCMStream(&stream, false, size, Audio::kADPCMMS, rate, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1, blockAlign); buffer = (byte *)malloc(size * 4); size = sndStream->readBuffer((int16*)buffer, size * 2); size *= 2; // 16bits. diff --git a/engines/saga/sndres.cpp b/engines/saga/sndres.cpp index a7a186ac1a..9b42443582 100644 --- a/engines/saga/sndres.cpp +++ b/engines/saga/sndres.cpp @@ -246,7 +246,7 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff buffer.buffer = NULL; free(soundResource); } else { - voxStream = Audio::makeADPCMStream(&readS, soundResourceLength, Audio::kADPCMOki); + voxStream = Audio::makeADPCMStream(&readS, false, soundResourceLength, Audio::kADPCMOki); buffer.buffer = (byte *)malloc(buffer.size); voxSize = voxStream->readBuffer((int16*)buffer.buffer, soundResourceLength * 2); if (voxSize != soundResourceLength * 2) { diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp index b074f644e0..da830515e2 100644 --- a/engines/scumm/he/sound_he.cpp +++ b/engines/scumm/he/sound_he.cpp @@ -569,7 +569,7 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags) } if (compType == 17) { - Audio::AudioStream *voxStream = Audio::makeADPCMStream(&stream, size, Audio::kADPCMMSIma, rate, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1, blockAlign); + Audio::AudioStream *voxStream = Audio::makeADPCMStream(&stream, false, size, Audio::kADPCMMSIma, rate, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1, blockAlign); sound = (char *)malloc(size * 4); size = voxStream->readBuffer((int16*)sound, size * 2); |