[Scummvm-git-logs] scummvm master -> 9b90d72af25c11c4ae4628df9e9deca8dce83489

lephilousophe noreply at scummvm.org
Mon Nov 3 20:18:21 UTC 2025


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:
9b90d72af2 AUDIO: Don't delete soundfont before cleaning up


Commit: 9b90d72af25c11c4ae4628df9e9deca8dce83489
    https://github.com/scummvm/scummvm/commit/9b90d72af25c11c4ae4628df9e9deca8dce83489
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2025-11-03T21:18:10+01:00

Commit Message:
AUDIO: Don't delete soundfont before cleaning up

This is useless as it will get destroyed by delete_fluid_synth and it
causes troubles with the Fluidsynth embedded OSAL which does not support
threads.
Indeed, deleting a soundfont in use relies on a timer thread to do the
cleanup after it's been released.

Changed paths:
    audio/softsynth/fluidsynth.cpp


diff --git a/audio/softsynth/fluidsynth.cpp b/audio/softsynth/fluidsynth.cpp
index 72994bab6e0..f511386a3df 100644
--- a/audio/softsynth/fluidsynth.cpp
+++ b/audio/softsynth/fluidsynth.cpp
@@ -517,9 +517,6 @@ void MidiDriver_FluidSynth::close() {
 
 	_mixer->stopHandle(_mixerSoundHandle);
 
-	if (_soundFont != -1)
-		fluid_synth_sfunload(_synth, _soundFont, 1);
-
 	delete_fluid_synth(_synth);
 	delete_fluid_settings(_settings);
 }




More information about the Scummvm-git-logs mailing list