diff options
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/sound/audio.cpp | 8 | ||||
| -rw-r--r-- | engines/sci/sound/iterator/iterator.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/sound/music.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp index bdb8c165f6..d2986a301b 100644 --- a/engines/sci/sound/audio.cpp +++ b/engines/sci/sound/audio.cpp @@ -170,10 +170,10 @@ static byte *readSOLAudio(Common::SeekableReadStream *audioStream, uint32 &size, // Convert the SOL stream flags to our own format flags = 0; if (audioFlags & kSolFlag16Bit) - flags |= Audio::Mixer::FLAG_16BITS | Audio::Mixer::FLAG_LITTLE_ENDIAN; + flags |= Audio::FLAG_16BITS | Audio::FLAG_LITTLE_ENDIAN; if (!(audioFlags & kSolFlagIsSigned)) - flags |= Audio::Mixer::FLAG_UNSIGNED; + flags |= Audio::FLAG_UNSIGNED; if (audioFlags & kSolFlagCompressed) { buffer = (byte *)malloc(size * 2); @@ -240,7 +240,7 @@ Audio::RewindableAudioStream *AudioPlayer::getAudioStream(uint32 number, uint32 data = (byte *)malloc(size); assert(data); memcpy(data, audioRes->data, size); - flags = Audio::Mixer::FLAG_UNSIGNED; + flags = Audio::FLAG_UNSIGNED; } } @@ -248,7 +248,7 @@ Audio::RewindableAudioStream *AudioPlayer::getAudioStream(uint32 number, uint32 audioStream = Audio::makeRawMemoryStream(data, size, DisposeAfterUse::YES, _audioRate, flags); if (audioStream) { - *sampleLen = (flags & Audio::Mixer::FLAG_16BITS ? size >> 1 : size) * 60 / _audioRate; + *sampleLen = (flags & Audio::FLAG_16BITS ? size >> 1 : size) * 60 / _audioRate; return audioStream; } diff --git a/engines/sci/sound/iterator/iterator.cpp b/engines/sci/sound/iterator/iterator.cpp index 5cb5f2d321..2c54b0bdee 100644 --- a/engines/sci/sound/iterator/iterator.cpp +++ b/engines/sci/sound/iterator/iterator.cpp @@ -551,7 +551,7 @@ static Audio::AudioStream *makeStream(byte *data, int size, int rate) { memcpy(sound, data, size); // Convert stream format flags - int flags = Audio::Mixer::FLAG_UNSIGNED; + int flags = Audio::FLAG_UNSIGNED; return Audio::makeRawMemoryStream(sound, size, DisposeAfterUse::YES, rate, flags, 0, 0); } diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp index 65d3d2cd16..d96fdcbe70 100644 --- a/engines/sci/sound/music.cpp +++ b/engines/sci/sound/music.cpp @@ -165,7 +165,7 @@ void SciMusic::soundInitSnd(MusicEntry *pSnd) { if (track->digitalChannelNr != -1) { byte *channelData = track->channels[track->digitalChannelNr].data; delete pSnd->pStreamAud; - pSnd->pStreamAud = Audio::makeRawMemoryStream(channelData, track->digitalSampleSize, DisposeAfterUse::NO, track->digitalSampleRate, Audio::Mixer::FLAG_UNSIGNED); + pSnd->pStreamAud = Audio::makeRawMemoryStream(channelData, track->digitalSampleSize, DisposeAfterUse::NO, track->digitalSampleRate, Audio::FLAG_UNSIGNED); delete pSnd->pLoopStream; pSnd->pLoopStream = 0; pSnd->soundType = Audio::Mixer::kSFXSoundType; |