[Scummvm-git-logs] scummvm master -> 569bb43b065ff0ab65c7c68b95fdfbdf271e95d6

[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:
569bb43b06 SCUMM: (INDY3/MAC) - change music default back to auto


Commit: 569bb43b065ff0ab65c7c68b95fdfbdf271e95d6
    https://github.com/scummvm/scummvm/commit/569bb43b065ff0ab65c7c68b95fdfbdf271e95d6
Author: athrxx (athrxx at scummvm.org)
Date: 2024-02-09T19:24:23+01:00

Commit Message:
SCUMM: (INDY3/MAC) - change music default back to auto

(which always seems to result in high quality in ScummVM,
since we never fail the scripted speed test)

Changed paths:
    engines/scumm/players/player_mac_indy3.cpp


diff --git a/engines/scumm/players/player_mac_indy3.cpp b/engines/scumm/players/player_mac_indy3.cpp
index 08bbfcec3aa..029d030bc8d 100644
--- a/engines/scumm/players/player_mac_indy3.cpp
+++ b/engines/scumm/players/player_mac_indy3.cpp
@@ -1037,7 +1037,7 @@ Common::WeakPtr<I3MPlayer> *I3MPlayer::_inst = nullptr;
 I3MPlayer::I3MPlayer(ScummEngine *vm, Audio::Mixer *mixer) :
 	_vm(vm), _mixer(mixer), _musicChannels(nullptr), _curSound(0), _curSong(0), _lastSoundEffectPrio(0), _idRangeMax(86), _soundEffectNumLoops(-1),
 	_musicIDTable(nullptr), _macstr(nullptr), _musicIDTableLen(0), _soundUsage(0), _mdrv(nullptr), _sdrv(nullptr), _nextTickProc(this, &I3MPlayer::nextTick),
-	_soundEffectPlaying(false), _songTimer(0), _songTimerInternal(0), _qmode(2), _16bit(false), _qualHi(false),	_mixerThread(false), _activeChanCount(0),
+	_soundEffectPlaying(false), _songTimer(0), _songTimerInternal(0), _qmode(0), _16bit(false), _qualHi(false),	_mixerThread(false), _activeChanCount(0),
 	_songUnfinished(false), _numMusicChannels(8), _numMusicTracks(4) {
 	assert(_vm);
 	assert(_mixer);
@@ -1395,7 +1395,7 @@ void I3MPlayer::updateSong() {
 	if (_curSong && (_qualHi || (_mdrv->getStatus() & I3MSoundDriver::kStatusDone))) {
 		_mdrv->clearFlags(I3MSoundDriver::kStatusOverflow);
 		while (_curSong && !(_mdrv->getStatus() & I3MSoundDriver::kStatusOverflow)) {
-			for (int i = _qualHi ? 4 : 4; i; --i) {
+			for (int i = 4; i; --i) {
 				for (int ii = 0; ii < _numMusicTracks && _curSong; ++ii)
 					_musicChannels[ii]->nextTick();
 			}