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/sound.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/sound.cpp')
| -rw-r--r-- | engines/scumm/sound.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index bdb4e658a1..b32686a215 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -272,10 +272,10 @@ void Sound::playSound(int soundID) { // We'd have to add the 'Creative Voice File' header for this, though, // or make readVOCFromMemory() less strict. - VocBlockHeader &voc_block_hdr = *(VocBlockHeader *)ptr; + Audio::VocBlockHeader &voc_block_hdr = *(Audio::VocBlockHeader *)ptr; assert(voc_block_hdr.blocktype == 1); size = voc_block_hdr.size[0] + (voc_block_hdr.size[1] << 8) + (voc_block_hdr.size[2] << 16) - 2; - rate = getSampleRateFromVOCRate(voc_block_hdr.sr); + rate = Audio::getSampleRateFromVOCRate(voc_block_hdr.sr); assert(voc_block_hdr.pack == 0); // Allocate a sound buffer, copy the data into it, and play @@ -600,29 +600,29 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle } if (!_soundsPaused && _vm->_mixer->isReady()) { - AudioStream *input = NULL; + Audio::AudioStream *input = NULL; switch (_soundMode) { case kMP3Mode: #ifdef USE_MAD assert(size > 0); - input = makeMP3Stream(_sfxFile, size); + input = Audio::makeMP3Stream(_sfxFile, size); #endif break; case kVorbisMode: #ifdef USE_VORBIS assert(size > 0); - input = makeVorbisStream(_sfxFile, size); + input = Audio::makeVorbisStream(_sfxFile, size); #endif break; case kFlacMode: #ifdef USE_FLAC assert(size > 0); - input = makeFlacStream(_sfxFile, size); + input = Audio::makeFlacStream(_sfxFile, size); #endif break; default: - input = makeVOCStream(*_sfxFile); + input = Audio::makeVOCStream(*_sfxFile); } if (!input) { |