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 /scumm/smush | |
| 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 'scumm/smush')
| -rw-r--r-- | scumm/smush/smush_mixer.cpp | 2 | ||||
| -rw-r--r-- | scumm/smush/smush_player.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
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 |