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

[AndywinXp]

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

Summary:
390f7ecc0a SCUMM: HE (Sound): Add more debug information
e462e4a004 SCUMM: HE (Sound): Don't remove sound from heap if it's an override of a spooled sound


Commit: 390f7ecc0aa7a4f0a70ec20e1908cfbd8c4d0a61
    https://github.com/scummvm/scummvm/commit/390f7ecc0aa7a4f0a70ec20e1908cfbd8c4d0a61
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-08-25T22:07:06+02:00

Commit Message:
SCUMM: HE (Sound): Add more debug information

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


diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index cdeb3bbc17e..2064d15b902 100644
--- a/engines/scumm/he/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
@@ -884,6 +884,9 @@ void SoundHE::triggerSpoolingSound(int song, int offset, int channel, int flags,
 	if (_heSpoolingMusicCount != 0) {
 		for (int i = 0; i < _heSpoolingMusicCount; i++) {
 			if (_heSpoolingMusicTable[i].song == song) {
+				debug(5, "SoundHE::triggerSpoolingSound(): Starting spooling sound %d with offset %d, on channel %d with flags %d",
+					song, offset, channel, flags);
+
 				Common::String filename(_vm->generateFilename(-4));
 				int fileOffset = 0;
 				int songsize = 0;


Commit: e462e4a0043b27eb150445e3028b315d5c72665d
    https://github.com/scummvm/scummvm/commit/e462e4a0043b27eb150445e3028b315d5c72665d
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-08-25T22:07:40+02:00

Commit Message:
SCUMM: HE (Sound): Don't remove sound from heap if it's an override of a spooled sound

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 d956f6ebc81..b1deb5c7db1 100644
--- a/engines/scumm/he/mixer_he.cpp
+++ b/engines/scumm/he/mixer_he.cpp
@@ -1093,7 +1093,7 @@ void HEMixer::milesStopAndCallback(int channel, int messageId) {
 		int globType = _milesChannels[channel]._globType;
 		int globNum = _milesChannels[channel]._globNum;
 
-		if (!_vm->_res->isOffHeap((ResType)globType, globNum)) {
+		if (!_milesChannels[channel]._isUsingStreamOverride && !_vm->_res->isOffHeap((ResType)globType, globNum)) {
 			_vm->_res->unlock((ResType)globType, globNum);
 
 			if (globType == rtSound && globNum == HSND_TALKIE_SLOT) {