[Scummvm-git-logs] scummvm master -> ed56d9c31775f27c30f236e6b3932c5a59d8f4cf

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ed56d9c317 DIRECTOR: Sync channel volume during fades


Commit: ed56d9c31775f27c30f236e6b3932c5a59d8f4cf
    https://github.com/scummvm/scummvm/commit/ed56d9c31775f27c30f236e6b3932c5a59d8f4cf
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-06-01T22:08:36+02:00

Commit Message:
DIRECTOR: Sync channel volume during fades

Changed paths:
    engines/director/sound.cpp


diff --git a/engines/director/sound.cpp b/engines/director/sound.cpp
index 9db300d2cf3..3513c5fa504 100644
--- a/engines/director/sound.cpp
+++ b/engines/director/sound.cpp
@@ -267,6 +267,8 @@ void DirectorSound::registerFade(uint8 soundChannel, bool fadeIn, int ticks) {
 
 	_channels[soundChannel]->fade = new FadeParams(startVol, targetVol, ticks, _window->getVM()->getMacTicks(), fadeIn);
 	_mixer->setChannelVolume(_channels[soundChannel]->handle, startVol);
+
+	_channels[soundChannel]->volume = startVol;
 }
 
 bool DirectorSound::fadeChannel(uint8 soundChannel) {
@@ -295,6 +297,9 @@ bool DirectorSound::fadeChannel(uint8 soundChannel) {
 
 	debugC(5, kDebugSound, "DirectorSound::fadeChannel(): fading channel %d volume to %d", soundChannel, fadeVol);
 	_mixer->setChannelVolume(_channels[soundChannel]->handle, fadeVol);
+
+	_channels[soundChannel]->volume = fadeVol;
+
 	return true;
 }