diff options
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/imuse_digi/dimuse.cpp | 16 | ||||
-rw-r--r-- | scumm/imuse_digi/dimuse_track.cpp | 16 | ||||
-rw-r--r-- | scumm/script_v8.cpp | 6 | ||||
-rw-r--r-- | scumm/scumm.cpp | 6 | ||||
-rw-r--r-- | scumm/smush/smush_mixer.cpp | 2 | ||||
-rw-r--r-- | scumm/smush/smush_player.cpp | 6 | ||||
-rw-r--r-- | scumm/sound.cpp | 4 |
7 files changed, 28 insertions, 28 deletions
diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp index 73a7deb882..a86afca775 100644 --- a/scumm/imuse_digi/dimuse.cpp +++ b/scumm/imuse_digi/dimuse.cpp @@ -187,14 +187,14 @@ void IMuseDigital::saveOrLoad(Serializer *ser) { const int pan = (track->pan != 64) ? 2 * track->pan - 127 : 0; const int vol = track->vol / 1000; - SoundMixer::SoundType type = SoundMixer::kPlainAudioDataType; + SoundMixer::SoundType type = SoundMixer::kPlainSoundType; if (track->volGroupId == 1) - type = SoundMixer::kSpeechAudioDataType; + type = SoundMixer::kSpeechSoundType; if (track->volGroupId == 2) - type = SoundMixer::kSFXAudioDataType; + type = SoundMixer::kSFXSoundType; if (track->volGroupId == 3) - type = SoundMixer::kMusicAudioDataType; + type = SoundMixer::kMusicSoundType; _vm->_mixer->playInputStream(type, &track->handle, track->stream, -1, vol, pan, false); } @@ -241,14 +241,14 @@ void IMuseDigital::callback() { const int pan = (track->pan != 64) ? 2 * track->pan - 127 : 0; const int vol = track->vol / 1000; - SoundMixer::SoundType type = SoundMixer::kPlainAudioDataType; + SoundMixer::SoundType type = SoundMixer::kPlainSoundType; if (track->volGroupId == 1) - type = SoundMixer::kSpeechAudioDataType; + type = SoundMixer::kSpeechSoundType; if (track->volGroupId == 2) - type = SoundMixer::kSFXAudioDataType; + type = SoundMixer::kSFXSoundType; if (track->volGroupId == 3) - type = SoundMixer::kMusicAudioDataType; + type = SoundMixer::kMusicSoundType; if (track->stream) { byte *data = NULL; diff --git a/scumm/imuse_digi/dimuse_track.cpp b/scumm/imuse_digi/dimuse_track.cpp index 21bf0aa5e2..dc1c38161f 100644 --- a/scumm/imuse_digi/dimuse_track.cpp +++ b/scumm/imuse_digi/dimuse_track.cpp @@ -163,14 +163,14 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, } else { const int pan = (track->pan != 64) ? 2 * track->pan - 127 : 0; const int vol = track->vol / 1000; - SoundMixer::SoundType type = SoundMixer::kPlainAudioDataType; + SoundMixer::SoundType type = SoundMixer::kPlainSoundType; if (track->volGroupId == 1) - type = SoundMixer::kSpeechAudioDataType; + type = SoundMixer::kSpeechSoundType; if (track->volGroupId == 2) - type = SoundMixer::kSFXAudioDataType; + type = SoundMixer::kSFXSoundType; if (track->volGroupId == 3) - type = SoundMixer::kMusicAudioDataType; + type = SoundMixer::kMusicSoundType; // setup 1 second stream wrapped buffer int32 streamBufferSize = track->iteration; @@ -303,14 +303,14 @@ IMuseDigital::Track *IMuseDigital::cloneToFadeOutTrack(Track *track, int fadeDel fadeTrack->volFadeStep = (fadeTrack->volFadeDest - fadeTrack->vol) * 60 * (1000 / _callbackFps) / (1000 * fadeDelay); fadeTrack->volFadeUsed = true; - SoundMixer::SoundType type = SoundMixer::kPlainAudioDataType; + SoundMixer::SoundType type = SoundMixer::kPlainSoundType; if (fadeTrack->volGroupId == 1) - type = SoundMixer::kSpeechAudioDataType; + type = SoundMixer::kSpeechSoundType; if (fadeTrack->volGroupId == 2) - type = SoundMixer::kSFXAudioDataType; + type = SoundMixer::kSFXSoundType; if (fadeTrack->volGroupId == 3) - type = SoundMixer::kMusicAudioDataType; + type = SoundMixer::kMusicSoundType; // setup 1 second stream wrapped buffer int32 streamBufferSize = fadeTrack->iteration; diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp index 7b026d49b0..0b76bf0f05 100644 --- a/scumm/script_v8.cpp +++ b/scumm/script_v8.cpp @@ -1384,13 +1384,13 @@ void ScummEngine_v8::o8_kernelGetFunctions() { } break; case 0xDD: // getGroupSfxVol - push(_mixer->getVolumeForSoundType(SoundMixer::kSFXAudioDataType) / 2); + push(_mixer->getVolumeForSoundType(SoundMixer::kSFXSoundType) / 2); break; case 0xDE: // getGroupVoiceVol - push(_mixer->getVolumeForSoundType(SoundMixer::kSpeechAudioDataType) / 2); + push(_mixer->getVolumeForSoundType(SoundMixer::kSpeechSoundType) / 2); break; case 0xDF: // getGroupMusicVol - push(_mixer->getVolumeForSoundType(SoundMixer::kMusicAudioDataType) / 2); + push(_mixer->getVolumeForSoundType(SoundMixer::kMusicSoundType) / 2); break; case 0xE0: // readRegistryValue { diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index a7e40493d5..d0355ae35d 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -1595,9 +1595,9 @@ void ScummEngine::setupVolumes() { _musicEngine->setMusicVolume(soundVolumeMusic); } - _mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, soundVolumeSfx); - _mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, soundVolumeMusic); - _mixer->setVolumeForSoundType(SoundMixer::kSpeechAudioDataType, soundVolumeSpeech); + _mixer->setVolumeForSoundType(SoundMixer::kSFXSoundType, soundVolumeSfx); + _mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, soundVolumeMusic); + _mixer->setVolumeForSoundType(SoundMixer::kSpeechSoundType, soundVolumeSpeech); } diff --git a/scumm/smush/smush_mixer.cpp b/scumm/smush/smush_mixer.cpp index fdfb154869..791b689491 100644 --- a/scumm/smush/smush_mixer.cpp +++ b/scumm/smush/smush_mixer.cpp @@ -122,7 +122,7 @@ bool SmushMixer::handleFrame() { if (_mixer->isReady()) { if (!_channels[i].handle.isActive()) { _channels[i].stream = makeAppendableAudioStream(rate, flags, 500000); - _mixer->playInputStream(SoundMixer::kSFXAudioDataType, &_channels[i].handle, _channels[i].stream); + _mixer->playInputStream(SoundMixer::kSFXSoundType, &_channels[i].handle, _channels[i].stream); } _mixer->setChannelVolume(_channels[i].handle, vol); _mixer->setChannelBalance(_channels[i].handle, pan); diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp index 236efd0d6a..093108082e 100644 --- a/scumm/smush/smush_player.cpp +++ b/scumm/smush/smush_player.cpp @@ -509,7 +509,7 @@ void SmushPlayer::handleIACT(Chunk &b) { if (!_IACTchannel.isActive()) { _IACTstream = makeAppendableAudioStream(22050, SoundMixer::FLAG_STEREO | SoundMixer::FLAG_16BITS, 400000); - _vm->_mixer->playInputStream(SoundMixer::kSFXAudioDataType, &_IACTchannel, _IACTstream); + _vm->_mixer->playInputStream(SoundMixer::kSFXSoundType, &_IACTchannel, _IACTstream); } _IACTstream->append(output_data, 0x1000); @@ -1192,7 +1192,7 @@ void SmushPlayer::tryCmpFile(const char *filename) { if (_compressedFile.isOpen()) { int size = _compressedFile.size(); _compressedFileMode = true; - _vm->_mixer->playInputStream(SoundMixer::kSFXAudioDataType, &_compressedFileSoundHandle, makeMP3Stream(&_compressedFile, size)); + _vm->_mixer->playInputStream(SoundMixer::kSFXSoundType, &_compressedFileSoundHandle, makeMP3Stream(&_compressedFile, size)); return; } #endif @@ -1203,7 +1203,7 @@ void SmushPlayer::tryCmpFile(const char *filename) { if (_compressedFile.isOpen()) { int size = _compressedFile.size(); _compressedFileMode = true; - _vm->_mixer->playInputStream(SoundMixer::kSFXAudioDataType, &_compressedFileSoundHandle, makeVorbisStream(&_compressedFile, size)); + _vm->_mixer->playInputStream(SoundMixer::kSFXSoundType, &_compressedFileSoundHandle, makeVorbisStream(&_compressedFile, size)); return; } #endif diff --git a/scumm/sound.cpp b/scumm/sound.cpp index ec88299ef4..23584b6a76 100644 --- a/scumm/sound.cpp +++ b/scumm/sound.cpp @@ -772,7 +772,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, PlayingSoundHandle //_vm->_imuseDigital->stopSound(kTalkSoundID); _vm->_imuseDigital->startVoice(kTalkSoundID, input); } else { - _vm->_mixer->playInputStream(SoundMixer::kSFXAudioDataType, handle, input, id); + _vm->_mixer->playInputStream(SoundMixer::kSFXSoundType, handle, input, id); } } } @@ -1139,7 +1139,7 @@ ScummFile *Sound::openSfxFile() { } bool Sound::isSfxFinished() const { - return !_vm->_mixer->hasActiveChannelOfType(SoundMixer::kSFXAudioDataType); + return !_vm->_mixer->hasActiveChannelOfType(SoundMixer::kSFXSoundType); } // We use a real timer in an attempt to get better sync with CD tracks. This is |