diff options
| author | Max Horn | 2005-03-09 18:12:54 +0000 |
|---|---|---|
| committer | Max Horn | 2005-03-09 18:12:54 +0000 |
| commit | 0ec193b4be4113ccbc24f26f7bb4cefc3e3d6a41 (patch) | |
| tree | 16bc04d5b5ddc5945cf14bccb7ce53406aba0807 /simon | |
| parent | 13b8f678fc0ee6ab14e3264c58e858061fe625fd (diff) | |
| download | scummvm-rg350-0ec193b4be4113ccbc24f26f7bb4cefc3e3d6a41.tar.gz scummvm-rg350-0ec193b4be4113ccbc24f26f7bb4cefc3e3d6a41.tar.bz2 scummvm-rg350-0ec193b4be4113ccbc24f26f7bb4cefc3e3d6a41.zip | |
changing AudioDataType -> SoundType, so now the constant names match the name of the data type / the SoundMixer method names
svn-id: r17052
Diffstat (limited to 'simon')
| -rw-r--r-- | simon/simon.cpp | 4 | ||||
| -rw-r--r-- | simon/sound.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp index cd6fcfde38..cb12bce8b4 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -666,7 +666,7 @@ int SimonEngine::init(GameDetector &detector) { warning("Sound initialization failed. " "Features of the game that depend on sound synchronization will most likely break"); set_volume(ConfMan.getInt("sfx_volume")); - _mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, ConfMan.getInt("music_volume")); + _mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, ConfMan.getInt("music_volume")); _system->beginGFXTransaction(); initCommonGFX(detector); @@ -4226,7 +4226,7 @@ void SimonEngine::dx_unlock_attached() { } void SimonEngine::set_volume(int volume) { - _mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, volume); + _mixer->setVolumeForSoundType(SoundMixer::kSFXSoundType, volume); } byte SimonEngine::getByte() { diff --git a/simon/sound.cpp b/simon/sound.cpp index acd4dc0f16..4c2cb6a924 100644 --- a/simon/sound.cpp +++ b/simon/sound.cpp @@ -129,7 +129,7 @@ void WavSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) { error("playWav(%d): can't read WAVE header", sound); } - _mixer->playInputStream(SoundMixer::kSFXAudioDataType, handle, stream); + _mixer->playInputStream(SoundMixer::kSFXSoundType, handle, stream); } void VocSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) { @@ -177,7 +177,7 @@ void MP3Sound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) uint32 size = _offsets[sound + i] - _offsets[sound]; - _mixer->playInputStream(SoundMixer::kSFXAudioDataType, handle, makeMP3Stream(_file, size)); + _mixer->playInputStream(SoundMixer::kSFXSoundType, handle, makeMP3Stream(_file, size)); } #endif @@ -201,7 +201,7 @@ void VorbisSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) uint32 size = _offsets[sound + i] - _offsets[sound]; - _mixer->playInputStream(SoundMixer::kSFXAudioDataType, handle, makeVorbisStream(_file, size)); + _mixer->playInputStream(SoundMixer::kSFXSoundType, handle, makeVorbisStream(_file, size)); } #endif @@ -225,7 +225,7 @@ void FlacSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) uint32 size = _offsets[sound + i] - _offsets[sound]; - _mixer->playInputStream(SoundMixer::kSFXAudioDataType, handle, makeFlacStream(_file, size)); + _mixer->playInputStream(SoundMixer::kSFXSoundType, handle, makeFlacStream(_file, size)); } #endif |