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 /gob | |
| 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 'gob')
| -rw-r--r-- | gob/gob.cpp | 4 | ||||
| -rw-r--r-- | gob/sound.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gob/gob.cpp b/gob/gob.cpp index 43a21d61d8..de0ece0088 100644 --- a/gob/gob.cpp +++ b/gob/gob.cpp @@ -130,8 +130,8 @@ GobEngine::GobEngine(GameDetector *detector, OSystem * syst) : Engine(syst) { warning("Sound initialization failed."); } - _mixer->setVolumeForSoundType(SoundMixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); - _mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, ConfMan.getInt("music_volume")); + _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); + _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume")); _vm = this; } diff --git a/gob/sound.cpp b/gob/sound.cpp index bcab86b8b3..018fc48ab2 100644 --- a/gob/sound.cpp +++ b/gob/sound.cpp @@ -114,7 +114,7 @@ void snd_setBlasterPort(int16 port) {return;} void snd_speakerOn(int16 frequency, int32 length) { speakerStream.playNote(frequency, length); if (!_vm->_mixer->isSoundHandleActive(speakerHandle)) { - _vm->_mixer->playInputStream(SoundMixer::kSFXSoundType, &speakerHandle, &speakerStream, -1, 255, 0, false); + _vm->_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &speakerHandle, &speakerStream, -1, 255, 0, false); } } |