[Scummvm-git-logs] scummvm master -> 952e309e91f327f51f1f8e8901f133cb23b84361

AndywinXp noreply at scummvm.org
Fri Aug 25 19:29:55 UTC 2023


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:
952e309e91 SCUMM: HE (Sound): Remove loop size assertion


Commit: 952e309e91f327f51f1f8e8901f133cb23b84361
    https://github.com/scummvm/scummvm/commit/952e309e91f327f51f1f8e8901f133cb23b84361
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-08-25T21:29:47+02:00

Commit Message:
SCUMM: HE (Sound): Remove loop size assertion

This was in the original code for technical reasons regarding
how the original mixer did its job. We don't need it here. Bye!

Changed paths:
    engines/scumm/he/mixer_he.cpp


diff --git a/engines/scumm/he/mixer_he.cpp b/engines/scumm/he/mixer_he.cpp
index e30ce554424..d956f6ebc81 100644
--- a/engines/scumm/he/mixer_he.cpp
+++ b/engines/scumm/he/mixer_he.cpp
@@ -496,10 +496,6 @@ bool HEMixer::mixerStartChannel(
 		if (sampleLen <= 0) {
 			error("HEMixer::mixerStartChannel(): Sample invalid size %d", sampleLen);
 		}
-
-		if ((flags & CHANNEL_LOOPING) && (sampleLen <= MIXER_PCM_CHUNK_SIZE)) {
-			error("HEMixer::mixerStartChannel(): Sample too small to loop (%d)", sampleLen);
-		}
 	}
 
 	_mixerChannels[channel].flags = flags;




More information about the Scummvm-git-logs mailing list