[Scummvm-git-logs] scummvm master -> 818dd08f3f4cc233f5de7d6f1eda57eedd5151d8

[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:
8aa4d62240 SCUMM: SMUSH: Avoid usage of uninit variables
818dd08f3f SCUMM: SMUSH: Add debug messages for audio fades


Commit: 8aa4d622404aff068520327b5738afe8146de82f
    https://github.com/scummvm/scummvm/commit/8aa4d622404aff068520327b5738afe8146de82f
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-01-19T20:45:58+01:00

Commit Message:
SCUMM: SMUSH: Avoid usage of uninit variables

Changed paths:
    engines/scumm/smush/smush_player.cpp


diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 17784100b69..1beafd22c07 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -1603,6 +1603,9 @@ void SmushPlayer::processDispatches(int16 feedSize) {
 			_smushTracksNeedInit = false;
 			for (int i = 0; i < SMUSH_MAX_TRACKS; i++) {
 				_smushDispatch[i].fadeRemaining = 0;
+				_smushDispatch[i].fadeVolume = 0;
+				_smushDispatch[i].fadeSampleRate = 0;
+				_smushDispatch[i].elapsedAudio = 0;
 				_smushDispatch[i].audioLength = 0;
 			}
 		}


Commit: 818dd08f3f4cc233f5de7d6f1eda57eedd5151d8
    https://github.com/scummvm/scummvm/commit/818dd08f3f4cc233f5de7d6f1eda57eedd5151d8
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-01-19T20:46:32+01:00

Commit Message:
SCUMM: SMUSH: Add debug messages for audio fades

Changed paths:
    engines/scumm/smush/smush_player.cpp


diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 1beafd22c07..e449c08c45d 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -1701,6 +1701,8 @@ void SmushPlayer::processDispatches(int16 feedSize) {
 						fadeVolume = _smushDispatch[i].fadeRemaining * _smushDispatch[i].fadeVolume * _smushTrackVols[0] / (SMUSH_FADE_SIZE * 127);
 						fadePan = _smushTracks[i].pan;
 
+						debug(5, "SmushPlayer::processDispatches(): fading dispatch %d, volume %d", i, fadeVolume);
+
 						sendAudioToDiMUSE(
 							&_smushTracks[i].fadeBuf[SMUSH_FADE_SIZE - _smushDispatch[i].fadeRemaining],
 							fadeMixStartingPoint,
@@ -1745,8 +1747,10 @@ void SmushPlayer::processDispatches(int16 feedSize) {
 
 							if (mixInFrameCount + _smushDispatch[i].audioRemaining <= _smushTracks[i].availableSize) {
 								// Fade-in until full volume is reached
-								if (_smushDispatch[i].volumeStep < 16)
+								if (_smushDispatch[i].volumeStep < 16) {
 									_smushDispatch[i].volumeStep++;
+									debug(5, "SmushPlayer::processDispatches(): fading track %d, volume step %d", i, _smushDispatch[i].volumeStep);
+								}
 
 								if (mixInFrameCount > engineBaseFeedSize / 4)
 									mixInFrameCount = engineBaseFeedSize / 4;
@@ -1758,8 +1762,10 @@ void SmushPlayer::processDispatches(int16 feedSize) {
 								speechIsPlaying = !speechIsPlaying ? (_smushTracks[i].flags & TRK_TYPE_MASK) == IS_SPEECH : true;
 							} else {
 								// Fade-out until silent
-								if (_smushDispatch[i].volumeStep)
+								if (_smushDispatch[i].volumeStep) {
 									_smushDispatch[i].volumeStep--;
+									debug(5, "SmushPlayer::processDispatches(): fading track %d, volume step %d", i, _smushDispatch[i].volumeStep);
+								}
 
 								_smushTracks[i].state = TRK_STATE_ENDING;