diff options
author | Max Horn | 2007-02-03 21:37:52 +0000 |
---|---|---|
committer | Max Horn | 2007-02-03 21:37:52 +0000 |
commit | 73c3625f1f171212d0c2f8e112994f3ee7c6294e (patch) | |
tree | 939e5d78844c6a4bba66bf40cfdf67bfd5d4ce60 /engines/sword1 | |
parent | a2b1ff0de842d800ad311dc2e1b2638722cbdda9 (diff) | |
download | scummvm-rg350-73c3625f1f171212d0c2f8e112994f3ee7c6294e.tar.gz scummvm-rg350-73c3625f1f171212d0c2f8e112994f3ee7c6294e.tar.bz2 scummvm-rg350-73c3625f1f171212d0c2f8e112994f3ee7c6294e.zip |
Fixing various doxygen warnings
svn-id: r25362
Diffstat (limited to 'engines/sword1')
-rw-r--r-- | engines/sword1/sound.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sword1/sound.cpp b/engines/sword1/sound.cpp index fa4d9c3adc..42107ae6b1 100644 --- a/engines/sword1/sound.cpp +++ b/engines/sword1/sound.cpp @@ -196,12 +196,12 @@ bool Sound::startSpeech(uint16 roomNo, uint16 localNo) { uint32 size; int16 *data = uncompressSpeech(index + _cowHeaderSize, sampleSize, &size); if (data) - _mixer->playRaw(Audio::Mixer::kSFXSoundType, &_speechHandle, data, size, 11025, SPEECH_FLAGS, SOUND_SPEECH_ID, speechVol, speechPan); + _mixer->playRaw(Audio::Mixer::kSpeechSoundType, &_speechHandle, data, size, 11025, SPEECH_FLAGS, SOUND_SPEECH_ID, speechVol, speechPan); } #ifdef USE_MAD else if (_cowMode == CowMp3) { _cowFile.seek(index); - _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_speechHandle, Audio::makeMP3Stream(&_cowFile, sampleSize), SOUND_SPEECH_ID, speechVol, speechPan); + _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, Audio::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++) @@ -212,7 +212,7 @@ bool Sound::startSpeech(uint16 roomNo, uint16 localNo) { #ifdef USE_VORBIS else if (_cowMode == CowVorbis) { _cowFile.seek(index); - _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_speechHandle, Audio::makeVorbisStream(&_cowFile, sampleSize), SOUND_SPEECH_ID, speechVol, speechPan); + _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_speechHandle, Audio::makeVorbisStream(&_cowFile, sampleSize), SOUND_SPEECH_ID, speechVol, speechPan); for (int cnt = 0; cnt < 480; cnt++) _waveVolume[cnt] = true; _waveVolPos = 0; |