[Scummvm-git-logs] scummvm master -> 07dc19e221503516ca48f8686ea78237f6a0206c

[bluegr]

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

Summary:
87f43cf721 MTROPOLIS: Use subtrack field instead of _noteChannelToTrack, which no longer works
07dc19e221 AUDIO: Remove obsolete _noteChannelToTrack field


Commit: 87f43cf721203bf11febfbac5f9cab522dc6ab8c
    https://github.com/scummvm/scummvm/commit/87f43cf721203bf11febfbac5f9cab522dc6ab8c
Author: elasota (1137273+elasota at users.noreply.github.com)
Date: 2025-06-13T09:58:59+02:00

Commit Message:
MTROPOLIS: Use subtrack field instead of _noteChannelToTrack, which no longer works

Fixes track muting in Obsidian robot walk and statue area not working

Changed paths:
    engines/mtropolis/plugin/midi.cpp


diff --git a/engines/mtropolis/plugin/midi.cpp b/engines/mtropolis/plugin/midi.cpp
index d4fc554a54b..cf6c958cb14 100644
--- a/engines/mtropolis/plugin/midi.cpp
+++ b/engines/mtropolis/plugin/midi.cpp
@@ -129,7 +129,7 @@ void MidiParser_MTropolis::setMutedTracks(uint16 mutedTracks) {
 
 bool MidiParser_MTropolis::processEvent(const EventInfo &info, bool fireEvents) {
 	if ((info.event & 0xf0) == MidiDriver_BASE::MIDI_COMMAND_NOTE_ON) {
-		int track = _noteChannelToTrack[info.event & 0xf];
+		int track = info.subtrack;
 		if (track >= 0 && (_mutedTracks & (1 << track)))
 			return true;
 	}


Commit: 07dc19e221503516ca48f8686ea78237f6a0206c
    https://github.com/scummvm/scummvm/commit/07dc19e221503516ca48f8686ea78237f6a0206c
Author: elasota (1137273+elasota at users.noreply.github.com)
Date: 2025-06-13T09:58:59+02:00

Commit Message:
AUDIO: Remove obsolete _noteChannelToTrack field

Changed paths:
    audio/midiparser_smf.cpp
    audio/midiparser_smf.h


diff --git a/audio/midiparser_smf.cpp b/audio/midiparser_smf.cpp
index cb781df00fb..e1945f11212 100644
--- a/audio/midiparser_smf.cpp
+++ b/audio/midiparser_smf.cpp
@@ -27,8 +27,6 @@
 #include "common/util.h"
 
 MidiParser_SMF::MidiParser_SMF(int8 source) : MidiParser(source) {
-	for (int i = 0; i < ARRAYSIZE(_noteChannelToTrack); i++)
-		_noteChannelToTrack[i] = -1;
 }
 
 void MidiParser_SMF::parseNextEvent(EventInfo &info) {
diff --git a/audio/midiparser_smf.h b/audio/midiparser_smf.h
index c9cee1c2dc6..66d1af0d88e 100644
--- a/audio/midiparser_smf.h
+++ b/audio/midiparser_smf.h
@@ -28,8 +28,6 @@
  * The Standard MIDI File version of MidiParser.
  */
 class MidiParser_SMF : public MidiParser {
-protected:
-	int8 _noteChannelToTrack[16];
 
 protected:
 	/**