diff options
| author | Max Horn | 2006-03-03 15:51:33 +0000 |
|---|---|---|
| committer | Max Horn | 2006-03-03 15:51:33 +0000 |
| commit | 140f6fce26ae3b710c5d37bcc4d08b6690a5d669 (patch) | |
| tree | 2a087bdd6375b4245072888f17ccdc74776b4aba /engines | |
| parent | 5833b3b0aafb87cc3a278011e2bf3f5f6e02ee22 (diff) | |
| download | scummvm-rg350-140f6fce26ae3b710c5d37bcc4d08b6690a5d669.tar.gz scummvm-rg350-140f6fce26ae3b710c5d37bcc4d08b6690a5d669.tar.bz2 scummvm-rg350-140f6fce26ae3b710c5d37bcc4d08b6690a5d669.zip | |
Hiding the implementation of ADPCMInputStream from the public, in favor of a factory function (just like with the other AudioStream subclasses)
svn-id: r21043
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/saga/sndres.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/sound_he.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/saga/sndres.cpp b/engines/saga/sndres.cpp index d3679599fd..40c6bd86a6 100644 --- a/engines/saga/sndres.cpp +++ b/engines/saga/sndres.cpp @@ -217,7 +217,7 @@ bool SndRes::load(ResourceContext *context, uint32 resourceId, SoundBuffer &buff buffer.buffer = NULL; free(soundResource); } else { - voxStream = new ADPCMInputStream(&readS, soundResourceLength, kADPCMOki); + voxStream = makeADPCMStream(&readS, soundResourceLength, 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 bb01ede275..06736ab29a 100644 --- a/engines/scumm/he/sound_he.cpp +++ b/engines/scumm/he/sound_he.cpp @@ -419,7 +419,7 @@ void Sound::playHESound(int soundID, int heOffset, int heChannel, int heFlags) { } if (compType == 17) { - AudioStream *voxStream = new ADPCMInputStream(&stream, size, kADPCMIma, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1, blockAlign); + AudioStream *voxStream = makeADPCMStream(&stream, size, kADPCMIma, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1, blockAlign); sound = (char *)malloc(size * 4); size = voxStream->readBuffer((int16*)sound, size * 2); |
