[Scummvm-git-logs] scummvm master -> 342afe0925dc2b1b7492c028640fa8ad1f50f4c6

[AndywinXp]

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:
342afe0925 SCUMM: DIMUSE: Rename previously mislabeled argument in dispatchSwitchStream()


Commit: 342afe0925dc2b1b7492c028640fa8ad1f50f4c6
    https://github.com/scummvm/scummvm/commit/342afe0925dc2b1b7492c028640fa8ad1f50f4c6
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-11-26T12:54:24+01:00

Commit Message:
SCUMM: DIMUSE: Rename previously mislabeled argument in dispatchSwitchStream()

Changed paths:
    engines/scumm/imuse_digi/dimuse_dispatch.cpp
    engines/scumm/imuse_digi/dimuse_engine.h


diff --git a/engines/scumm/imuse_digi/dimuse_dispatch.cpp b/engines/scumm/imuse_digi/dimuse_dispatch.cpp
index 5ce7baa3cfd..ab57dd9dc97 100644
--- a/engines/scumm/imuse_digi/dimuse_dispatch.cpp
+++ b/engines/scumm/imuse_digi/dimuse_dispatch.cpp
@@ -253,7 +253,7 @@ int IMuseDigital::dispatchRelease(IMuseDigiTrack *trackPtr) {
 	return 0;
 }
 
-int IMuseDigital::dispatchSwitchStream(int oldSoundId, int newSoundId, int fadeLength, int unusedFadeSyncFlag, int offsetFadeSyncFlag) {
+int IMuseDigital::dispatchSwitchStream(int oldSoundId, int newSoundId, int fadeLength, int exitTriggerSyncFlag, int offsetFadeSyncFlag) {
 	int32 effFadeLen, effFadeSize, strZnSize;
 	int getMapResult, i;
 	IMuseDigiDispatch *curDispatch = _dispatches;
@@ -308,7 +308,7 @@ int IMuseDigital::dispatchSwitchStream(int oldSoundId, int newSoundId, int fadeL
 			curDispatch->fadeWordSize = curDispatch->wordSize;
 			curDispatch->fadeSampleRate = curDispatch->sampleRate;
 			curDispatch->fadeChannelCount = curDispatch->channelCount;
-			curDispatch->fadeSyncFlag = unusedFadeSyncFlag | offsetFadeSyncFlag;
+			curDispatch->fadeSyncFlag = exitTriggerSyncFlag | offsetFadeSyncFlag;
 			curDispatch->fadeSyncDelta = 0;
 			curDispatch->fadeVol = DIMUSE_MAX_FADE_VOLUME;
 			curDispatch->fadeSlope = 0;
diff --git a/engines/scumm/imuse_digi/dimuse_engine.h b/engines/scumm/imuse_digi/dimuse_engine.h
index f563518bca3..eef6b2ca1b8 100644
--- a/engines/scumm/imuse_digi/dimuse_engine.h
+++ b/engines/scumm/imuse_digi/dimuse_engine.h
@@ -245,7 +245,7 @@ private:
 	int dispatchRestoreStreamZones();
 	int dispatchAllocateSound(IMuseDigiTrack *trackPtr, int groupId);
 	int dispatchRelease(IMuseDigiTrack *trackPtr);
-	int dispatchSwitchStream(int oldSoundId, int newSoundId, int fadeLength, int unusedFadeSyncFlag, int offsetFadeSyncFlag);
+	int dispatchSwitchStream(int oldSoundId, int newSoundId, int fadeLength, int exitTriggerSyncFlag, int offsetFadeSyncFlag);
 	int dispatchSwitchStream(int oldSoundId, int newSoundId, uint8 *crossfadeBuffer, int crossfadeBufferSize, int vocLoopFlag);
 	void dispatchProcessDispatches(IMuseDigiTrack *trackPtr, int feedSize, int sampleRate);
 	void dispatchProcessDispatches(IMuseDigiTrack *trackPtr, int feedSize);