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 /sword2/driver | |
| 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 'sword2/driver')
| -rw-r--r-- | sword2/driver/animation.cpp | 6 | ||||
| -rw-r--r-- | sword2/driver/d_sound.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sword2/driver/animation.cpp b/sword2/driver/animation.cpp index 6d9a7db779..2f428b144f 100644 --- a/sword2/driver/animation.cpp +++ b/sword2/driver/animation.cpp @@ -182,7 +182,7 @@ int32 MoviePlayer::play(const char *filename, MovieTextObject *text[], int32 lea leadIn += sizeof(StandardHeader); - _vm->_sound->playFx(&leadInHandle, leadIn, leadInLen, SoundMixer::kMaxChannelVolume, 0, false, SoundMixer::kMusicAudioDataType); + _vm->_sound->playFx(&leadInHandle, leadIn, leadInLen, SoundMixer::kMaxChannelVolume, 0, false, SoundMixer::kMusicSoundType); } byte *leadOut = NULL; @@ -301,7 +301,7 @@ void MoviePlayer::playMPEG(const char *filename, MovieTextObject *text[], byte * frameCounter++; if (frameCounter == leadOutFrame && leadOut) - _vm->_sound->playFx(&_leadOutHandle, leadOut, leadOutLen, SoundMixer::kMaxChannelVolume, 0, false, SoundMixer::kMusicAudioDataType); + _vm->_sound->playFx(&_leadOutHandle, leadOut, leadOutLen, SoundMixer::kMaxChannelVolume, 0, false, SoundMixer::kMusicSoundType); OSystem::Event event; while (_sys->pollEvent(event)) { @@ -516,7 +516,7 @@ void MoviePlayer::playDummy(const char *filename, MovieTextObject *text[], byte // subtitles. if (!skipCutscene && leadOut) - _vm->_sound->playFx(&_leadOutHandle, leadOut, leadOutLen, SoundMixer::kMaxChannelVolume, 0, false, SoundMixer::kMusicAudioDataType); + _vm->_sound->playFx(&_leadOutHandle, leadOut, leadOutLen, SoundMixer::kMaxChannelVolume, 0, false, SoundMixer::kMusicSoundType); _vm->_screen->setPalette(0, 256, oldPal, RDPAL_INSTANT); } diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp index 070cb15754..755aa1d73c 100644 --- a/sword2/driver/d_sound.cpp +++ b/sword2/driver/d_sound.cpp @@ -771,7 +771,7 @@ int32 Sound::playCompSpeech(uint32 speechId, uint8 vol, int8 pan) { p = -p; // Start the speech playing - _vm->_mixer->playInputStream(SoundMixer::kSpeechAudioDataType, &_soundHandleSpeech, input, -1, volume, p); + _vm->_mixer->playInputStream(SoundMixer::kSpeechSoundType, &_soundHandleSpeech, input, -1, volume, p); return RD_OK; } |