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

[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:
af75c433e0 SAGA: Fix MIDI driver type detection
ad41e96403 SAGA2: Fix MIDI driver type detection


Commit: af75c433e0aa81d298a867017c4912121b1b9f23
    https://github.com/scummvm/scummvm/commit/af75c433e0aa81d298a867017c4912121b1b9f23
Author: Coen Rampen (crampen at gmail.com)
Date: 2021-08-06T22:37:46+02:00

Commit Message:
SAGA: Fix MIDI driver type detection

This fixes a small omission in the MIDI driver type detection where it would
not look at the Native MT-32 setting to set MT-32 type on a MIDI device.

Changed paths:
    engines/saga/music.cpp


diff --git a/engines/saga/music.cpp b/engines/saga/music.cpp
index 7e62a0396e..2183de00c3 100644
--- a/engines/saga/music.cpp
+++ b/engines/saga/music.cpp
@@ -60,6 +60,8 @@ Music::Music(SagaEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixer(mixer), _par
 
 		MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | (_musicType == MT_MT32 ? MDT_PREFER_MT32 : MDT_PREFER_GM));
 		_driverType = MidiDriver::getMusicType(dev);
+		if (_driverType == MT_GM && ConfMan.getBool("native_mt32"))
+			_driverType = MT_MT32;
 
 		switch (_driverType) {
 		case MT_ADLIB:


Commit: ad41e96403342d273016500517791e54a275b84a
    https://github.com/scummvm/scummvm/commit/ad41e96403342d273016500517791e54a275b84a
Author: Coen Rampen (crampen at gmail.com)
Date: 2021-08-06T22:37:56+02:00

Commit Message:
SAGA2: Fix MIDI driver type detection

This fixes a small omission in the MIDI driver type detection where it would
not look at the Native MT-32 setting to set MT-32 type on a MIDI device.

Changed paths:
    engines/saga2/music.cpp


diff --git a/engines/saga2/music.cpp b/engines/saga2/music.cpp
index 5fcc3cafb3..eecf3564ad 100644
--- a/engines/saga2/music.cpp
+++ b/engines/saga2/music.cpp
@@ -47,6 +47,8 @@ Music::Music(hResContext *musicRes) : _musicContext(musicRes), _parser(0) {
 
 	MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_GM);
 	_driverType = MidiDriver::getMusicType(dev);
+	if (_driverType == MT_GM && ConfMan.getBool("native_mt32"))
+		_driverType = MT_MT32;
 
 	switch (_driverType) {
 	case MT_ADLIB: