diff options
| author | Matthew Hoops | 2015-09-02 22:03:25 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2015-09-04 23:48:40 -0400 |
| commit | 1d45e08889f1be3151c000fdde18f4b4b094c69c (patch) | |
| tree | af50134cee24d557ff5c49abd3ce378bef1d26d9 /engines | |
| parent | 84edf0c6a776caf1d783e8a2ef6ed5a2225e29cf (diff) | |
| download | scummvm-rg350-1d45e08889f1be3151c000fdde18f4b4b094c69c.tar.gz scummvm-rg350-1d45e08889f1be3151c000fdde18f4b4b094c69c.tar.bz2 scummvm-rg350-1d45e08889f1be3151c000fdde18f4b4b094c69c.zip | |
SCUMM: Do not reverse stereo for digital iMuse sounds
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse.cpp | 3 | ||||
| -rw-r--r-- | engines/scumm/imuse_digi/dimuse_track.cpp | 9 |
2 files changed, 4 insertions, 8 deletions
diff --git a/engines/scumm/imuse_digi/dimuse.cpp b/engines/scumm/imuse_digi/dimuse.cpp index db260dce42..3f61946bf2 100644 --- a/engines/scumm/imuse_digi/dimuse.cpp +++ b/engines/scumm/imuse_digi/dimuse.cpp @@ -201,8 +201,7 @@ void IMuseDigital::saveOrLoad(Serializer *ser) { track->stream = Audio::makeQueuingAudioStream(freq, (track->mixerFlags & kFlagStereo) != 0); - _mixer->playStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan(), - DisposeAfterUse::YES, false, (track->mixerFlags & kFlagStereo) != 0); + _mixer->playStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan()); _mixer->pauseHandle(track->mixChanHandle, true); } } diff --git a/engines/scumm/imuse_digi/dimuse_track.cpp b/engines/scumm/imuse_digi/dimuse_track.cpp index 34926fa34e..b7abdd074e 100644 --- a/engines/scumm/imuse_digi/dimuse_track.cpp +++ b/engines/scumm/imuse_digi/dimuse_track.cpp @@ -110,8 +110,7 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, track->souStreamUsed = (input != 0); if (track->souStreamUsed) { - _mixer->playStream(track->getType(), &track->mixChanHandle, input, -1, track->getVol(), track->getPan(), - DisposeAfterUse::YES, false, (track->mixerFlags & kFlagStereo) != 0); + _mixer->playStream(track->getType(), &track->mixChanHandle, input, -1, track->getVol(), track->getPan()); } else { strcpy(track->soundName, soundName); track->soundDesc = _sound->openSound(soundId, soundName, soundType, volGroupId, -1); @@ -167,8 +166,7 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, } track->stream = Audio::makeQueuingAudioStream(freq, track->mixerFlags & kFlagStereo); - _mixer->playStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan(), - DisposeAfterUse::YES, false, (track->mixerFlags & kFlagStereo) != 0); + _mixer->playStream(track->getType(), &track->mixChanHandle, track->stream, -1, track->getVol(), track->getPan()); } track->used = true; @@ -368,8 +366,7 @@ Track *IMuseDigital::cloneToFadeOutTrack(Track *track, int fadeDelay) { // Create an appendable output buffer fadeTrack->stream = Audio::makeQueuingAudioStream(_sound->getFreq(fadeTrack->soundDesc), track->mixerFlags & kFlagStereo); - _mixer->playStream(track->getType(), &fadeTrack->mixChanHandle, fadeTrack->stream, -1, fadeTrack->getVol(), fadeTrack->getPan(), - DisposeAfterUse::YES, false, (track->mixerFlags & kFlagStereo) != 0); + _mixer->playStream(track->getType(), &fadeTrack->mixChanHandle, fadeTrack->stream, -1, fadeTrack->getVol(), fadeTrack->getPan()); fadeTrack->used = true; debug(5, "cloneToFadeOutTrack() - end of func, soundId %d, fade soundId %d", track->soundId, fadeTrack->soundId); |