zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-04-22 07:30:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove sfont_zone_delete, replace with direct invocations instead

Browse source
This commit is contained in:
Marcus Weseloh 2018-04-04 11:03:47 +02:00
parent 4dbc31215f
commit f83c49d6fa
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/sfloader/fluid_sf2.c
View file

@ -267,7 +267,6 @@ static int load_shdr(unsigned int size, SFData *sf, void *fd, const fluid_file_c
static int fixup_pgen(SFData *sf);
static int fixup_igen(SFData *sf);
static int fixup_sample(SFData *sf);
static void sfont_zone_delete(SFData *sf, fluid_list_t **zlist, SFZone *zone);
static void sfont_free_zone(SFZone *zone);
static int sfont_preset_compare_func(void *a, void *b);
static fluid_list_t *gen_inlist(int gen, fluid_list_t *genlist);
@ -1064,7 +1063,8 @@ static int load_pgen(int size, SFData *sf, void *fd, const fluid_file_callbacks_
{ /* previous global zone exists, discard */
FLUID_LOG(FLUID_WARN, _("Preset \"%s\": Discarding invalid global zone"),
((SFPreset *)(p->data))->name);
sfont_zone_delete(sf, hz, (SFZone *)(p2->data));
*hz = fluid_list_remove(*hz, p2->data);
sfont_free_zone((SFZone *)fluid_list_get(p2));
}
}
@ -1444,7 +1444,8 @@ static int load_igen(int size, SFData *sf, void *fd, const fluid_file_callbacks_
{ /* previous global zone exists, discard */
FLUID_LOG(FLUID_WARN, _("Instrument \"%s\": Discarding invalid global zone"),
((SFInst *)(p->data))->name);
sfont_zone_delete(sf, hz, (SFZone *)(p2->data));
*hz = fluid_list_remove(*hz, p2->data);
sfont_free_zone((SFZone *)fluid_list_get(p2));
}
}
@ -1816,13 +1817,6 @@ static int sfont_preset_compare_func(void *a, void *b)
return (aval - bval);
}
/* delete zone from zone list */
static void sfont_zone_delete(SFData *sf, fluid_list_t **zlist, SFZone *zone)
{
*zlist = fluid_list_remove(*zlist, (void *)zone);
sfont_free_zone(zone);
}
/* Find generator in gen list */
static fluid_list_t *gen_inlist(int gen, fluid_list_t *genlist)
{ /* is generator in gen list? */