[Scummvm-git-logs] scummvm master -> 4baf05e6cfa6b91f16df176bc0bfbe743573918a

[neuromancer]

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:
4baf05e6cf FREESCAPE: adapt relative volume to make each sound source more uniform


Commit: 4baf05e6cfa6b91f16df176bc0bfbe743573918a
    https://github.com/scummvm/scummvm/commit/4baf05e6cfa6b91f16df176bc0bfbe743573918a
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2025-01-20T22:15:29+01:00

Commit Message:
FREESCAPE: adapt relative volume to make each sound source more uniform

Changed paths:
    engines/freescape/freescape.h
    engines/freescape/games/eclipse/dos.cpp
    engines/freescape/sound.cpp


diff --git a/engines/freescape/freescape.h b/engines/freescape/freescape.h
index aa767fcb103..3b91f389677 100644
--- a/engines/freescape/freescape.h
+++ b/engines/freescape/freescape.h
@@ -112,6 +112,10 @@ enum {
 	kFreescapeDebugGroup = 1 << 5,
 };
 
+enum {
+	kFreescapeDefaultVolume = 192,
+};
+
 enum GameStateControl {
 	kFreescapeGameStateStart,
 	kFreescapeGameStatePlaying,
diff --git a/engines/freescape/games/eclipse/dos.cpp b/engines/freescape/games/eclipse/dos.cpp
index f9aefea0fa0..ce0831474d0 100644
--- a/engines/freescape/games/eclipse/dos.cpp
+++ b/engines/freescape/games/eclipse/dos.cpp
@@ -250,7 +250,7 @@ void EclipseEngine::playSoundFx(int index, bool sync) {
 	byte *data = _soundsFx[index]->data;
 
 	Audio::SeekableAudioStream *stream = Audio::makeRawStream(data, size, 11025, Audio::FLAG_UNSIGNED, DisposeAfterUse::NO);
-	_mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundFxHandle, stream);
+	_mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundFxHandle, stream, -1, kFreescapeDefaultVolume / 10);
 }
 
 
diff --git a/engines/freescape/sound.cpp b/engines/freescape/sound.cpp
index 30e8a43e213..def35d5de9b 100644
--- a/engines/freescape/sound.cpp
+++ b/engines/freescape/sound.cpp
@@ -527,7 +527,7 @@ void FreescapeEngine::playSoundZX(Common::Array<soundUnitZX> *data) {
 	}
 
 	_mixer->stopHandle(_soundFxHandle);
-	_mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundFxHandle, _speaker, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
+	_mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundFxHandle, _speaker, -1, kFreescapeDefaultVolume, 0, DisposeAfterUse::NO);
 }
 
 void FreescapeEngine::playSoundDOS(soundSpeakerFx *speakerFxInfo, bool sync) {
@@ -543,7 +543,7 @@ void FreescapeEngine::playSoundDOS(soundSpeakerFx *speakerFxInfo, bool sync) {
 	}
 
 	_mixer->stopHandle(_soundFxHandle);
-	_mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundFxHandle, _speaker, -1, Audio::Mixer::kMaxChannelVolume / 8, 0, DisposeAfterUse::NO);
+	_mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundFxHandle, _speaker, -1, kFreescapeDefaultVolume / 2, 0, DisposeAfterUse::NO);
 }
 
 void FreescapeEngine::loadSoundsFx(Common::SeekableReadStream *file, int offset, int number) {