[Scummvm-git-logs] scummvm master -> 5864bbc1d02cbd9e2ea502d7095c4674afe58d93

[NMIError]

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:
780d8d187a AUDIO/MIDI: Fix volume changes not applied by Miles driver
5864bbc1d0 SAGA: Remove unused include from music


Commit: 780d8d187a6b90a6e512b4e9b16a059bb85e58bf
    https://github.com/scummvm/scummvm/commit/780d8d187a6b90a6e512b4e9b16a059bb85e58bf
Author: Coen Rampen (crampen at gmail.com)
Date: 2021-07-10T20:33:35+02:00

Commit Message:
AUDIO/MIDI: Fix volume changes not applied by Miles driver

This adds applying source volume for all sources to the Miles MIDI driver. This
was missing and caused changes to user volume not to be applied for some games.

Changed paths:
    audio/miles_midi.cpp


diff --git a/audio/miles_midi.cpp b/audio/miles_midi.cpp
index 85a44e57da..17df8ff2d5 100644
--- a/audio/miles_midi.cpp
+++ b/audio/miles_midi.cpp
@@ -880,7 +880,7 @@ void MidiDriver_Miles_Midi::applySourceVolume(uint8 source) {
 		// Apply the new source volume to this channel if this source is active
 		// on this channel, or if it was active on the channel before it was
 		// locked.
-		if (channel.currentData->source == source) {
+		if (source == 0xFF || channel.currentData->source == source) {
 			channelData = channel.currentData;
 		} else if (channel.locked && channel.unlockData->source == source) {
 			channelData = channel.unlockData;
@@ -888,7 +888,7 @@ void MidiDriver_Miles_Midi::applySourceVolume(uint8 source) {
 		}
 
 		if (channelData && channelData->volume != 0xFF)
-			controlChange(i, MIDI_CONTROLLER_VOLUME, channelData->volume, source, *channelData, channelLockedByOtherSource);
+			controlChange(i, MIDI_CONTROLLER_VOLUME, channelData->volume, channelData->source, *channelData, channelLockedByOtherSource);
 	}
 }
 


Commit: 5864bbc1d02cbd9e2ea502d7095c4674afe58d93
    https://github.com/scummvm/scummvm/commit/5864bbc1d02cbd9e2ea502d7095c4674afe58d93
Author: Coen Rampen (crampen at gmail.com)
Date: 2021-07-10T20:33:35+02:00

Commit Message:
SAGA: Remove unused include from music

Changed paths:
    engines/saga/music.h


diff --git a/engines/saga/music.h b/engines/saga/music.h
index bbdc1998e4..29e10c4a2b 100644
--- a/engines/saga/music.h
+++ b/engines/saga/music.h
@@ -27,7 +27,6 @@
 
 #include "audio/mididrv.h"
 #include "audio/mididrv_ms.h"
-#include "audio/midiplayer.h"
 #include "audio/midiparser.h"
 #include "audio/mixer.h"
 #include "audio/softsynth/fmtowns_pc98/towns_pc98_driver.h"