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/imuse_digi/dimuse_sndmgr.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/imuse_digi/dimuse_sndmgr.cpp')
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_sndmgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp index 29b70a4763..19d34eabc9 100644 --- a/engines/scumm/imuse_digi/dimuse_sndmgr.cpp +++ b/engines/scumm/imuse_digi/dimuse_sndmgr.cpp @@ -163,7 +163,7 @@ void ImuseDigiSndMgr::prepareSound(byte *ptr, soundStruct *sound) { int time_constant = ptr[offset]; offset += 2; len -= 2; - sound->freq = getSampleRateFromVOCRate(time_constant); + sound->freq = Audio::getSampleRateFromVOCRate(time_constant); sound->region[sound->numRegions].offset = offset; sound->region[sound->numRegions].length = len; sound->numRegions++; @@ -614,11 +614,11 @@ int32 ImuseDigiSndMgr::getDataFromRegion(soundStruct *soundHandle, int region, b if (!soundHandle->compressedStream) { #ifdef USE_VORBIS if (oggMode) - soundHandle->compressedStream = makeVorbisStream(cmpFile, len); + soundHandle->compressedStream = Audio::makeVorbisStream(cmpFile, len); #endif #ifdef USE_MAD if (!oggMode) - soundHandle->compressedStream = makeMP3Stream(cmpFile, len); + soundHandle->compressedStream = Audio::makeMP3Stream(cmpFile, len); #endif assert(soundHandle->compressedStream); } |