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

[digitall]

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:
a5d4e15f14 SCUMM: DiMUSE: Remove Older Code Path for 8-bit Stereo Audio Mixing


Commit: a5d4e15f14b329730e4487138fbddaa3ce3209ee
    https://github.com/scummvm/scummvm/commit/a5d4e15f14b329730e4487138fbddaa3ce3209ee
Author: D G Turner (digitall at scummvm.org)
Date: 2022-07-13T00:51:33+01:00

Commit Message:
SCUMM: DiMUSE: Remove Older Code Path for 8-bit Stereo Audio Mixing

This would have been executed instead of the newer code added in the
previous commit on this module.

Changed paths:
    engines/scumm/imuse_digi/dimuse_internalmixer.cpp


diff --git a/engines/scumm/imuse_digi/dimuse_internalmixer.cpp b/engines/scumm/imuse_digi/dimuse_internalmixer.cpp
index 737eb365ce7..11c420e94aa 100644
--- a/engines/scumm/imuse_digi/dimuse_internalmixer.cpp
+++ b/engines/scumm/imuse_digi/dimuse_internalmixer.cpp
@@ -1075,22 +1075,6 @@ void IMuseDigiInternalMixer::mixBits8Stereo(uint8 *srcBuf, int32 inFrameCount, i
 				mixBufCurCell += 2;
 			}
 		}
-	} else if (2 * inFrameCount == feedSize) {
-		srcBuf_ptr = srcBuf;
-		if (inFrameCount - 1 != 0) {
-			for (int i = 0; i < inFrameCount - 1; i++) {
-				mixBufCurCell[0] += *((uint16 *)ampTable + srcBuf_ptr[0]);
-				mixBufCurCell[1] += *((uint16 *)ampTable + srcBuf_ptr[1]);
-				mixBufCurCell[2] += (*((int16 *)ampTable + srcBuf_ptr[0]) + *((int16 *)ampTable + srcBuf_ptr[2])) >> 1;
-				mixBufCurCell[3] += (*((int16 *)ampTable + srcBuf_ptr[1]) + *((int16 *)ampTable + srcBuf_ptr[3])) >> 1;
-				mixBufCurCell += 4;
-				srcBuf_ptr += 2;
-			}
-		}
-		mixBufCurCell[0] += *((uint16 *)ampTable + srcBuf_ptr[0]);
-		mixBufCurCell[1] += *((uint16 *)ampTable + srcBuf_ptr[1]);
-		mixBufCurCell[2] += *((uint16 *)ampTable + srcBuf_ptr[0]);
-		mixBufCurCell[3] += *((uint16 *)ampTable + srcBuf_ptr[1]);
 	} else if (2 * feedSize == inFrameCount) {
 		if (feedSize) {
 			srcBuf_ptr = srcBuf;