[Scummvm-git-logs] scummvm master -> 969419c2f68c6622a11d40f09e154c2f66033e54

[athrxx]

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:
969419c2f6 SCUMM: (MI1/SegaCD) - prevent creation of imuse system and driver


Commit: 969419c2f68c6622a11d40f09e154c2f66033e54
    https://github.com/scummvm/scummvm/commit/969419c2f68c6622a11d40f09e154c2f66033e54
Author: athrxx (athrxx at scummvm.org)
Date: 2025-03-11T21:12:11+01:00

Commit Message:
SCUMM: (MI1/SegaCD) - prevent creation of imuse system and driver

(not needed - the music is CD audio and the sound effects are pcm)

Changed paths:
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 799cf624d10..234941ef238 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -2376,7 +2376,7 @@ void ScummEngine::setupMusic(int midi) {
 		_musicEngine = new Player_AD(this, _mixer->mutex());
 	} else if (_game.platform == Common::kPlatformDOS && _sound->_musicType == MDT_ADLIB && _game.heversion >= 60) {
 		_musicEngine = new Player_HE(this);
-	} else if (_game.version >= 3 && _game.heversion <= 62) {
+	} else if (_game.platform != Common::kPlatformSegaCD && _game.version >= 3 && _game.heversion <= 62) {
 		MidiDriver *nativeMidiDriver = nullptr;
 		MidiDriver *adlibMidiDriver = nullptr;
 		bool multi_midi = ConfMan.getBool("multi_midi") && _sound->_musicType != MDT_NONE && _sound->_musicType != MDT_PCSPK && (midi & MDT_ADLIB);