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

[sluicebox]

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:
ee139e1684 SCI32: Update GM detection for MOTHERGOOSE Mac


Commit: ee139e16840fb59741dd1120ba715f0e5a4c0daf
    https://github.com/scummvm/scummvm/commit/ee139e16840fb59741dd1120ba715f0e5a4c0daf
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2020-05-06T15:50:28-07:00

Commit Message:
SCI32: Update GM detection for MOTHERGOOSE Mac

Fixes MOTHERGOOSE Mac music, which unlike PC is not General MIDI.

Changed paths:
    engines/sci/engine/features.cpp
    engines/sci/sound/music.cpp


diff --git a/engines/sci/engine/features.cpp b/engines/sci/engine/features.cpp
index e76adeafa7..fad621525d 100644
--- a/engines/sci/engine/features.cpp
+++ b/engines/sci/engine/features.cpp
@@ -711,7 +711,8 @@ bool GameFeatures::generalMidiOnly() {
 #ifdef ENABLE_SCI32
 	switch (g_sci->getGameId()) {
 	case GID_MOTHERGOOSEHIRES:
-		return true;
+		return (g_sci->getPlatform() != Common::kPlatformMacintosh);
+
 	case GID_KQ7: {
 		if (g_sci->isDemo()) {
 			return false;
@@ -721,6 +722,10 @@ bool GameFeatures::generalMidiOnly() {
 		return (sound.exists() && sound.getTrackByType(/* AdLib */ 0) == nullptr);
 	}
 	default:
+		 if (g_sci->getPlatform() == Common::kPlatformMacintosh && 
+			 getSciVersion() >= SCI_VERSION_2_1_MIDDLE) {
+			 return true;
+		 }
 		break;
 	}
 #endif
diff --git a/engines/sci/sound/music.cpp b/engines/sci/sound/music.cpp
index 833a0c06eb..5ef9676774 100644
--- a/engines/sci/sound/music.cpp
+++ b/engines/sci/sound/music.cpp
@@ -71,17 +71,11 @@ void SciMusic::init() {
 
 	Common::Platform platform = g_sci->getPlatform();
 	uint32 deviceFlags;
-#ifdef ENABLE_SCI32
 	if (g_sci->_features->generalMidiOnly()) {
 		deviceFlags = MDT_MIDI;
-	} else if (platform == Common::kPlatformMacintosh && getSciVersion() >= SCI_VERSION_2_1_MIDDLE) {
-		deviceFlags = MDT_MIDI;
 	} else {
-#endif
 		deviceFlags = MDT_PCSPK | MDT_PCJR | MDT_ADLIB | MDT_MIDI;
-#ifdef ENABLE_SCI32
 	}
-#endif
 
 	// Default to MIDI for Windows versions of SCI1.1 games, as their
 	// soundtrack is written for GM.