[Scummvm-git-logs] scummvm master -> 7d48995d44c286ef1ed8b6068ab18d7e7c29347c

[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:
7d48995d44 SCUMM: (INDY3/MAC) - add launcher option for lq music


Commit: 7d48995d44c286ef1ed8b6068ab18d7e7c29347c
    https://github.com/scummvm/scummvm/commit/7d48995d44c286ef1ed8b6068ab18d7e7c29347c
Author: athrxx (athrxx at scummvm.org)
Date: 2024-02-09T20:54:52+01:00

Commit Message:
SCUMM: (INDY3/MAC) - add launcher option for lq music

(just attaching the alread existing option)

Changed paths:
    engines/scumm/metaengine.cpp
    engines/scumm/scumm.cpp
    engines/scumm/vars.cpp


diff --git a/engines/scumm/metaengine.cpp b/engines/scumm/metaengine.cpp
index e0a89446ff2..647fa986223 100644
--- a/engines/scumm/metaengine.cpp
+++ b/engines/scumm/metaengine.cpp
@@ -773,7 +773,7 @@ const ExtraGuiOptions ScummMetaEngine::getExtraGuiOptions(const Common::String &
 	// The low quality music in Loom was probably intended for low-end
 	// Macs. It plays only one channel, instead of three.
 
-	if (target.empty() || (gameid == "loom" && platform == Common::kPlatformMacintosh && extra != "Steam")) {
+	if (target.empty() || ((gameid == "loom" || gameid == "indy3") && platform == Common::kPlatformMacintosh && extra != "Steam")) {
 		options.push_back(macV3LowQualityMusic);
 	}
 
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 1647b5509ae..52927303543 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -2170,6 +2170,8 @@ void ScummEngine::setupMusic(int midi, const Common::Path &macInstrumentFile) {
 		_musicEngine = new Player_V4A(this, _mixer);
 	} else if (_game.platform == Common::kPlatformMacintosh && _game.id == GID_INDY3) {
 		_musicEngine = new Player_Mac_Indy3(this, _mixer);
+		if (ConfMan.hasKey("mac_v3_low_quality_music") && ConfMan.getBool("mac_v3_low_quality_music"))
+			_musicEngine->setQuality(Player_Mac_Indy3::kQualLo);
 		_sound->_musicType = MDT_MACINTOSH;
 	} else if (_game.platform == Common::kPlatformMacintosh && _game.id == GID_LOOM) {
 		_musicEngine = new Player_V3M(this, _mixer, ConfMan.getBool("mac_v3_low_quality_music"));
diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp
index ec21546739c..4c3fe5e4ca3 100644
--- a/engines/scumm/vars.cpp
+++ b/engines/scumm/vars.cpp
@@ -858,7 +858,10 @@ void ScummEngine::setSoundCardVarToCurrentConfig() {
 	// 4 Roland
 	switch (_sound->_musicType) {
 	case MDT_MACINTOSH:
-		VAR(VAR_SOUNDCARD) = (_game.id == GID_INDY3) ? 11 : 3;
+		if (_game.id == GID_INDY3)
+			VAR(VAR_SOUNDCARD) = (ConfMan.hasKey("mac_v3_low_quality_music") && ConfMan.getBool("mac_v3_low_quality_music")) ? 10 : 11;
+		else
+			VAR(VAR_SOUNDCARD) = 3;
 		break;
 	case MDT_NONE:
 	case MDT_PCSPK: