zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-03-01 15:10:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Only open the Soundfont for sample reading if necessary

Browse source
This commit is contained in:
Marcus Weseloh 2018-04-21 23:17:54 +02:00
parent c433fc887c
commit 9dcb4148cb
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/sfloader/fluid_defsfont.c
View file

@ -1691,14 +1691,7 @@ static int load_preset_samples(fluid_defsfont_t *defsfont, fluid_preset_t *prese
fluid_inst_t *inst; fluid_inst_t *inst;
fluid_inst_zone_t *inst_zone; fluid_inst_zone_t *inst_zone;
fluid_sample_t *sample; fluid_sample_t *sample;
SFData *sffile; SFData *sffile = NULL;
sffile = fluid_sffile_open(defsfont->filename, defsfont->fcbs);
if (sffile == NULL)
{
FLUID_LOG(FLUID_ERR, "Unable to open Soundfont file");
return FLUID_FAILED;
}
defpreset = fluid_preset_get_data(preset); defpreset = fluid_preset_get_data(preset);
preset_zone = fluid_defpreset_get_zone(defpreset); preset_zone = fluid_defpreset_get_zone(defpreset);
@ -1713,10 +1706,23 @@ static int load_preset_samples(fluid_defsfont_t *defsfont, fluid_preset_t *prese
{ {
sample->preset_count++; sample->preset_count++;
/* If this is the first time this sample has been selected,
* load the sampledata */
if (sample->preset_count == 1) if (sample->preset_count == 1)
{ {
/* This is the first time this sample has been selected, so /* Make sure we have an open Soundfont file. Do this here
* load the sampledata */ * to avoid having to open the file if no loading is necessary
* for a preset */
if (sffile == NULL)
{
sffile = fluid_sffile_open(defsfont->filename, defsfont->fcbs);
if (sffile == NULL)
{
FLUID_LOG(FLUID_ERR, "Unable to open Soundfont file");
return FLUID_FAILED;
}
}
if (fluid_defsfont_load_sampledata(defsfont, sffile, sample) == FLUID_FAILED) if (fluid_defsfont_load_sampledata(defsfont, sffile, sample) == FLUID_FAILED)
{ {
FLUID_LOG(FLUID_ERR, "Unable to load sample '%s', disabling", sample->name); FLUID_LOG(FLUID_ERR, "Unable to load sample '%s', disabling", sample->name);
@ -1730,7 +1736,10 @@ static int load_preset_samples(fluid_defsfont_t *defsfont, fluid_preset_t *prese
preset_zone = fluid_preset_zone_next(preset_zone); preset_zone = fluid_preset_zone_next(preset_zone);
} }
fluid_sffile_close(sffile); if (sffile != NULL)
{
fluid_sffile_close(sffile);
}
return FLUID_OK; return FLUID_OK;
} }