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 /saga | |
| 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 'saga')
| -rw-r--r-- | saga/music.cpp | 4 | ||||
| -rw-r--r-- | saga/saga.cpp | 4 | ||||
| -rw-r--r-- | saga/sound.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/saga/music.cpp b/saga/music.cpp index 956bdaedae..d58c39676f 100644 --- a/saga/music.cpp +++ b/saga/music.cpp @@ -295,7 +295,7 @@ void MusicPlayer::stopMusic() { Music::Music(SoundMixer *mixer, MidiDriver *driver, int enabled) : _mixer(mixer), _enabled(enabled), _adlib(false) { _player = new MusicPlayer(driver); _musicInitialized = 1; - _mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, ConfMan.getInt("music_volume")); + _mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, ConfMan.getInt("music_volume")); if (_vm->getGameType() == GType_ITE) { File file; @@ -448,7 +448,7 @@ int Music::play(uint32 music_rn, uint16 flags) { if (audioStream) { debug(0, "Playing digitized music"); - _mixer->playInputStream(SoundMixer::kMusicAudioDataType, &_musicHandle, audioStream); + _mixer->playInputStream(SoundMixer::kMusicSoundType, &_musicHandle, audioStream); return SUCCESS; } diff --git a/saga/saga.cpp b/saga/saga.cpp index 1a339088e5..c1d3d1a0cf 100644 --- a/saga/saga.cpp +++ b/saga/saga.cpp @@ -138,8 +138,8 @@ SagaEngine::SagaEngine(GameDetector *detector, OSystem *syst) warning("Sound initialization failed."); } - _mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, ConfMan.getInt("sfx_volume")); - _mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, ConfMan.getInt("music_volume")); + _mixer->setVolumeForSoundType(SoundMixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); + _mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, ConfMan.getInt("music_volume")); _vm = this; } diff --git a/saga/sound.cpp b/saga/sound.cpp index 2253ce8c5e..9db219934c 100644 --- a/saga/sound.cpp +++ b/saga/sound.cpp @@ -221,7 +221,7 @@ int Sound::playVoxVoice(SOUNDBUFFER *buf) { AudioStream *audioStream; audioStream = makeVOXStream(buf->s_buf, buf->s_buf_len); - _mixer->playInputStream(SoundMixer::kSFXAudioDataType, &_voiceHandle, audioStream); + _mixer->playInputStream(SoundMixer::kSFXSoundType, &_voiceHandle, audioStream); return SUCCESS; } |