[Scummvm-git-logs] scummvm master -> 8a121748ffa75a445df71ffd5aa67196a1c52294

[bluegr]

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

Summary:
8a121748ff AUDIO: Fix order of Macintosh music types


Commit: 8a121748ffa75a445df71ffd5aa67196a1c52294
    https://github.com/scummvm/scummvm/commit/8a121748ffa75a445df71ffd5aa67196a1c52294
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2025-06-02T20:40:30+03:00

Commit Message:
AUDIO: Fix order of Macintosh music types

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


diff --git a/audio/mididrv.cpp b/audio/mididrv.cpp
index 140eea0e07a..f90284e729e 100644
--- a/audio/mididrv.cpp
+++ b/audio/mididrv.cpp
@@ -353,6 +353,9 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) {
 		} else if (flags & MDT_SEGACD) {
 			tp = MT_SEGACD;
 			flags &= ~MDT_SEGACD;
+		} else if (flags & MDT_MACINTOSH) {
+			tp = MT_MACINTOSH;
+			flags &= ~MDT_MACINTOSH;
 		} else if (flags & MDT_ADLIB) {
 			tp = MT_ADLIB;
 			flags &= ~MDT_ADLIB;
@@ -371,9 +374,6 @@ MidiDriver::DeviceHandle MidiDriver::detectDevice(int flags) {
 		} else if (flags & MDT_APPLEIIGS) {
 			tp = MT_APPLEIIGS;
 			flags &= ~MDT_APPLEIIGS;
-		} else if (flags & MDT_MACINTOSH) {
-			tp = MT_MACINTOSH;
-			flags &= ~MDT_MACINTOSH;
 		} else if (flags & MDT_MIDI) {
 			// If we haven't tried to find a MIDI device yet we do this now.
 			skipMidi = false;
diff --git a/audio/mididrv.h b/audio/mididrv.h
index 7a215907a5d..1013ae51d58 100644
--- a/audio/mididrv.h
+++ b/audio/mididrv.h
@@ -55,12 +55,14 @@ enum MusicType {
 	MT_TOWNS,			// FM-TOWNS
 	MT_PC98,			// PC98
 	MT_SEGACD,			// SegaCD
+	MT_MACINTOSH,		// Apple Macintosh
+
+	// All devices after this one are treated as MIDI devices
 	MT_GM,				// General MIDI
 	MT_MT32,			// MT-32
 	MT_GS,				// Roland GS
 	MT_MT540,			// Casio MT-540
-	MT_CT460,			// Casio CT-460 / CSM-1
-	MT_MACINTOSH		// Apple Macintosh
+	MT_CT460			// Casio CT-460 / CSM-1
 };
 
 /**