diff options
| author | Max Horn | 2006-04-29 22:33:31 +0000 |
|---|---|---|
| committer | Max Horn | 2006-04-29 22:33:31 +0000 |
| commit | 27307acd7c6f9f9083bdcad38ba54f18d4f080b7 (patch) | |
| tree | fd7360382a19b07dcca9b711080b3f6c8f64fd38 /engines/scumm/he/sound_he.cpp | |
| parent | ac0ae13bee890b78442788abe6b87e514c9928a0 (diff) | |
| download | scummvm-rg350-27307acd7c6f9f9083bdcad38ba54f18d4f080b7.tar.gz scummvm-rg350-27307acd7c6f9f9083bdcad38ba54f18d4f080b7.tar.bz2 scummvm-rg350-27307acd7c6f9f9083bdcad38ba54f18d4f080b7.zip | |
Moved the AudioCDManager as well as class AudioStream and its (standard) subclasses to namespace Audio
svn-id: r22231
Diffstat (limited to 'engines/scumm/he/sound_he.cpp')
| -rw-r--r-- | engines/scumm/he/sound_he.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp index 9519087efe..23224354c0 100644 --- a/engines/scumm/he/sound_he.cpp +++ b/engines/scumm/he/sound_he.cpp @@ -538,12 +538,12 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags) size = READ_LE_UINT32(ptr + 4); Common::MemoryReadStream stream(ptr, size); - if (!loadWAVFromStream(stream, size, rate, flags, &compType, &blockAlign)) { + if (!Audio::loadWAVFromStream(stream, size, rate, flags, &compType, &blockAlign)) { error("playHESound: Not a valid WAV file (%d)", soundID); } if (compType == 17) { - AudioStream *voxStream = makeADPCMStream(&stream, size, kADPCMMSIma, rate, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1, blockAlign); + Audio::AudioStream *voxStream = Audio::makeADPCMStream(&stream, size, Audio::kADPCMMSIma, rate, (flags & Audio::Mixer::FLAG_STEREO) ? 2 : 1, blockAlign); sound = (char *)malloc(size * 4); size = voxStream->readBuffer((int16*)sound, size * 2); |