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 /sword1 | |
| 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 'sword1')
| -rw-r--r-- | sword1/credits.cpp | 2 | ||||
| -rw-r--r-- | sword1/sound.cpp | 4 | ||||
| -rw-r--r-- | sword1/sword1.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sword1/credits.cpp b/sword1/credits.cpp index 527bf74a0f..9db7217156 100644 --- a/sword1/credits.cpp +++ b/sword1/credits.cpp @@ -113,7 +113,7 @@ void CreditsPlayer::play(void) { // everything's initialized, time to render and show the credits. PlayingSoundHandle bgSound; - _mixer->playInputStream(SoundMixer::kMusicAudioDataType, &bgSound, bgSoundStream, 0); + _mixer->playInputStream(SoundMixer::kMusicSoundType, &bgSound, bgSoundStream, 0); int relDelay = 0; uint16 scrollY = 0; diff --git a/sword1/sound.cpp b/sword1/sound.cpp index 6c0e0c3e8f..a55c476448 100644 --- a/sword1/sound.cpp +++ b/sword1/sound.cpp @@ -195,7 +195,7 @@ bool Sound::startSpeech(uint16 roomNo, uint16 localNo) { #ifdef USE_MAD else if (_cowMode == CowMp3) { _cowFile.seek(index); - _mixer->playInputStream(SoundMixer::kSFXAudioDataType, &_speechHandle, makeMP3Stream(&_cowFile, sampleSize), SOUND_SPEECH_ID, speechVol, speechPan); + _mixer->playInputStream(SoundMixer::kSFXSoundType, &_speechHandle, makeMP3Stream(&_cowFile, sampleSize), SOUND_SPEECH_ID, speechVol, speechPan); // with compressed audio, we can't calculate the wave volume. // so default to talking. for (int cnt = 0; cnt < 480; cnt++) @@ -206,7 +206,7 @@ bool Sound::startSpeech(uint16 roomNo, uint16 localNo) { #ifdef USE_VORBIS else if (_cowMode == CowVorbis) { _cowFile.seek(index); - _mixer->playInputStream(SoundMixer::kSFXAudioDataType, &_speechHandle, makeVorbisStream(&_cowFile, sampleSize), SOUND_SPEECH_ID, speechVol, speechPan); + _mixer->playInputStream(SoundMixer::kSFXSoundType, &_speechHandle, makeVorbisStream(&_cowFile, sampleSize), SOUND_SPEECH_ID, speechVol, speechPan); for (int cnt = 0; cnt < 480; cnt++) _waveVolume[cnt] = true; _waveVolPos = 0; diff --git a/sword1/sword1.cpp b/sword1/sword1.cpp index 9ea9d3e4a9..abfc98a528 100644 --- a/sword1/sword1.cpp +++ b/sword1/sword1.cpp @@ -166,8 +166,8 @@ int SwordEngine::init(GameDetector &detector) { _resMan = new ResMan("swordres.rif"); debug(5, "Starting object manager"); _objectMan = new ObjectMan(_resMan); - _mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, SoundMixer::kMaxMixerVolume); - _mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, SoundMixer::kMaxMixerVolume); + _mixer->setVolumeForSoundType(SoundMixer::kSFXSoundType, SoundMixer::kMaxMixerVolume); + _mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, SoundMixer::kMaxMixerVolume); _mouse = new Mouse(_system, _resMan, _objectMan); _screen = new Screen(_system, _resMan, _objectMan); _music = new Music(_mixer); |