zdoom
/
fluidsynth
mirror of https://github.com/ZDoom/fluidsynth.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix regression introduced in a89399476e 

Mentioned commit broke fluid_synth_start() when using a DLS soundfont.
This commit is contained in:
derselbst 2020-06-26 17:38:46 +02:00
parent 19a20eb852
commit 4261848dd4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/synth/fluid_synth.c
View File

@ -6344,15 +6344,14 @@ int
fluid_synth_start(fluid_synth_t *synth, unsigned int id, fluid_preset_t *preset, fluid_synth_start(fluid_synth_t *synth, unsigned int id, fluid_preset_t *preset,
int audio_chan, int chan, int key, int vel) int audio_chan, int chan, int key, int vel)
{ {
int result; int result, dynamic_samples;
fluid_defsfont_t *defsfont;
fluid_return_val_if_fail(preset != NULL, FLUID_FAILED); fluid_return_val_if_fail(preset != NULL, FLUID_FAILED);
fluid_return_val_if_fail(key >= 0 && key <= 127, FLUID_FAILED); fluid_return_val_if_fail(key >= 0 && key <= 127, FLUID_FAILED);
fluid_return_val_if_fail(vel >= 1 && vel <= 127, FLUID_FAILED); fluid_return_val_if_fail(vel >= 1 && vel <= 127, FLUID_FAILED);
FLUID_API_ENTRY_CHAN(FLUID_FAILED); FLUID_API_ENTRY_CHAN(FLUID_FAILED);
defsfont = fluid_sfont_get_data(preset->sfont); fluid_settings_getint(fluid_synth_get_settings(synth), "synth.dynamic-sample-loading", &dynamic_samples);
if(defsfont->dynamic_samples) if(dynamic_samples)
{ {
// The preset might not be currently used, thus its sample data may not be loaded. // The preset might not be currently used, thus its sample data may not be loaded.
// This guard is to avoid a NULL deref in rvoice_write(). // This guard is to avoid a NULL deref in rvoice_write().