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

[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:
aacb0cac11 Revert "DIRECTOR: Report inactive channel volume as 0"


Commit: aacb0cac11b5b55660924f7397417a7810eab0bb
    https://github.com/scummvm/scummvm/commit/aacb0cac11b5b55660924f7397417a7810eab0bb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-06-05T20:05:34+02:00

Commit Message:
Revert "DIRECTOR: Report inactive channel volume as 0"

This reverts commit 72d890b751699894334107bba330fe5c957d931b.

This brought a regression of turning sound in many games.

It breaks again the7colors when exiting the car:

  --start-movie=03CAR:xn--Car.IO-ma28a:CarOutSideView03

Changed paths:
    engines/director/sound.cpp


diff --git a/engines/director/sound.cpp b/engines/director/sound.cpp
index 3513c5fa504..52bf73b158b 100644
--- a/engines/director/sound.cpp
+++ b/engines/director/sound.cpp
@@ -106,9 +106,6 @@ uint8 DirectorSound::getChannelVolume(uint8 soundChannel) {
 	if (!assertChannel(soundChannel))
 		return 0;
 
-	if (!_mixer->isSoundHandleActive(_channels[soundChannel]->handle))
-		return 0;
-
 	return _enable ? _channels[soundChannel]->volume : 0;
 }