diff options
| author | Max Horn | 2005-05-10 23:48:48 +0000 |
|---|---|---|
| committer | Max Horn | 2005-05-10 23:48:48 +0000 |
| commit | 1a615346abab8f234c3dbd1c55e78b179bca9d87 (patch) | |
| tree | f687ac73ffbfa29088a403b6311bb4db13265fde /saga/sound.cpp | |
| parent | 72f4c03b0b9a6918a359b967ebc400a2701981d9 (diff) | |
| download | scummvm-rg350-1a615346abab8f234c3dbd1c55e78b179bca9d87.tar.gz scummvm-rg350-1a615346abab8f234c3dbd1c55e78b179bca9d87.tar.bz2 scummvm-rg350-1a615346abab8f234c3dbd1c55e78b179bca9d87.zip | |
Moved class SoundMixer to Audio::Mixer (didn't call the namespace 'Sound' because we already have many classes with that name)
svn-id: r18039
Diffstat (limited to 'saga/sound.cpp')
| -rw-r--r-- | saga/sound.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/saga/sound.cpp b/saga/sound.cpp index 2ba533d26a..ae1a14cf04 100644 --- a/saga/sound.cpp +++ b/saga/sound.cpp @@ -30,7 +30,7 @@ namespace Saga { -Sound::Sound(SagaEngine *vm, SoundMixer *mixer, int enabled) : +Sound::Sound(SagaEngine *vm, Audio::Mixer *mixer, int enabled) : _vm(vm), _mixer(mixer), _enabled(enabled), _voxStream(0) { _soundInitialized = 1; @@ -53,20 +53,20 @@ int Sound::playSoundBuffer(SoundHandle *handle, SOUNDBUFFER *buf, int volume, bo return FAILURE; } - flags = SoundMixer::FLAG_AUTOFREE; + flags = Audio::Mixer::FLAG_AUTOFREE; if (loop) - flags |= SoundMixer::FLAG_LOOP; + flags |= Audio::Mixer::FLAG_LOOP; if (buf->s_samplebits == 16) { - flags |= SoundMixer::FLAG_16BITS; + flags |= Audio::Mixer::FLAG_16BITS; if (!(_vm->getFeatures() & GF_BIG_ENDIAN_DATA)) - flags |= SoundMixer::FLAG_LITTLE_ENDIAN; + flags |= Audio::Mixer::FLAG_LITTLE_ENDIAN; } if (buf->s_stereo) - flags |= SoundMixer::FLAG_STEREO; + flags |= Audio::Mixer::FLAG_STEREO; if (!buf->s_signed) - flags |= SoundMixer::FLAG_UNSIGNED; + flags |= Audio::Mixer::FLAG_UNSIGNED; _mixer->playRaw(handle, buf->s_buf, buf->s_buf_len, buf->s_freq, flags, -1, volume); @@ -120,7 +120,7 @@ int Sound::playVoxVoice(SOUNDBUFFER *buf) { _voxStream = new Common::MemoryReadStream(buf->s_buf, buf->s_buf_len); audioStream = makeADPCMStream(*_voxStream, buf->s_buf_len, kADPCMOki); - _mixer->playInputStream(SoundMixer::kSFXSoundType, &_voiceHandle, audioStream); + _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_voiceHandle, audioStream); return SUCCESS; } |