diff options
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse.cpp | 7 | ||||
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_track.cpp | 9 | ||||
| -rw-r--r-- | sound/mixer.cpp | 2 | ||||
| -rw-r--r-- | sound/mixer.h | 3 |
4 files changed, 10 insertions, 11 deletions
diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp index cf5cc99579..43c72bc7ad 100644 --- a/engines/scumm/imuse_digi/dimuse.cpp +++ b/engines/scumm/imuse_digi/dimuse.cpp @@ -85,8 +85,6 @@ int32 IMuseDigital::makeMixerFlags(int32 flags) { mixerFlags |= Audio::Mixer::FLAG_LITTLE_ENDIAN; if (flags & kFlagStereo) mixerFlags |= Audio::Mixer::FLAG_STEREO; - if (flags & kFlagReverseStereo) - mixerFlags |= Audio::Mixer::FLAG_REVERSE_STEREO; return mixerFlags; } @@ -202,9 +200,10 @@ void IMuseDigital::saveOrLoad(Serializer *ser) { track->mixerFlags |= kFlagLittleEndian; #endif - track->stream = Audio::makeQueuingAudioStream(freq, track->mixerFlags & kFlagStereo); + track->stream = Audio::makeQueuingAudioStream(freq, (track->mixerFlags & kFlagStereo) != 0); - _mixer->playInputStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan()); + _mixer->playInputStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan(), + DisposeAfterUse::YES, false, (track->mixerFlags & kFlagReverseStereo) != 0); _mixer->pauseHandle(track->mixChanHandle, true); } } diff --git a/engines/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp index 58ae48d330..dd68181cc9 100644 --- a/engines/scumm/imuse_digi/dimuse_track.cpp +++ b/engines/scumm/imuse_digi/dimuse_track.cpp @@ -112,7 +112,8 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, track->souStreamUsed = (input != 0); if (track->souStreamUsed) { - _mixer->playInputStream(track->getType(), &track->mixChanHandle, input, -1, track->getVol(), track->getPan()); + _mixer->playInputStream(track->getType(), &track->mixChanHandle, input, -1, track->getVol(), track->getPan(), + DisposeAfterUse::YES, false, (track->mixerFlags & kFlagReverseStereo) != 0); } else { strcpy(track->soundName, soundName); track->soundDesc = _sound->openSound(soundId, soundName, soundType, volGroupId, -1); @@ -173,7 +174,8 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, } track->stream = Audio::makeQueuingAudioStream(freq, track->mixerFlags & kFlagStereo); - _mixer->playInputStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan()); + _mixer->playInputStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan(), + DisposeAfterUse::YES, false, (track->mixerFlags & kFlagReverseStereo) != 0); } track->used = true; @@ -373,7 +375,8 @@ Track *IMuseDigital::cloneToFadeOutTrack(Track *track, int fadeDelay) { // Create an appendable output buffer fadeTrack->stream = Audio::makeQueuingAudioStream(_sound->getFreq(fadeTrack->soundDesc), track->mixerFlags & kFlagStereo); - _mixer->playInputStream(track->getType(), &fadeTrack->mixChanHandle, fadeTrack->stream, -1, fadeTrack->getVol(), fadeTrack->getPan()); + _mixer->playInputStream(track->getType(), &fadeTrack->mixChanHandle, fadeTrack->stream, -1, fadeTrack->getVol(), fadeTrack->getPan(), + DisposeAfterUse::YES, false, (track->mixerFlags & kFlagReverseStereo) != 0); fadeTrack->used = true; debug(5, "cloneToFadeOutTrack() - end of func, soundId %d, fade soundId %d", track->soundId, fadeTrack->soundId); diff --git a/sound/mixer.cpp b/sound/mixer.cpp index 7a5be35fbb..c891fb6b99 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -231,7 +231,7 @@ void MixerImpl::playRaw( AudioStream *input = makeRawMemoryStream((byte *)sound, size, autofreeBuffer, rate, flags, loopStart, loopEnd); // Play it - playInputStream(type, handle, input, id, volume, balance, DisposeAfterUse::YES, false, ((flags & Mixer::FLAG_REVERSE_STEREO) != 0)); + playInputStream(type, handle, input, id, volume, balance, DisposeAfterUse::YES, false, false); } void MixerImpl::playInputStream( diff --git a/sound/mixer.h b/sound/mixer.h index 0055e51d87..1d7b5e198a 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -85,9 +85,6 @@ public: /** sound is in stereo (default: mono) */ FLAG_STEREO = 1 << 3, - /** reverse the left and right stereo channel */ - FLAG_REVERSE_STEREO = 1 << 4, - /** loop the audio */ FLAG_LOOP = 1 << 6 }; |