summaryrefslogtreecommitdiff
path: root/libs/fluidsynth/src/fluid_defsfont.c
diff options
context:
space:
mode:
Diffstat (limited to 'libs/fluidsynth/src/fluid_defsfont.c')
-rw-r--r--libs/fluidsynth/src/fluid_defsfont.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/fluidsynth/src/fluid_defsfont.c b/libs/fluidsynth/src/fluid_defsfont.c
index 8c0fd5ed98..8defa70519 100644
--- a/libs/fluidsynth/src/fluid_defsfont.c
+++ b/libs/fluidsynth/src/fluid_defsfont.c
@@ -104,7 +104,7 @@ fluid_sfont_t *fluid_defsfloader_load(fluid_sfloader_t *loader, const char *file
if(fluid_defsfont_load(defsfont, &loader->file_callbacks, filename) == FLUID_FAILED)
{
- fluid_sfont_delete_internal(sfont);
+ fluid_defsfont_sfont_delete(sfont);
return NULL;
}
@@ -499,7 +499,7 @@ int fluid_defsfont_load(fluid_defsfont_t *defsfont, const fluid_file_callbacks_t
while(p != NULL)
{
sfpreset = (SFPreset *)fluid_list_get(p);
- defpreset = new_fluid_defpreset(defsfont);
+ defpreset = new_fluid_defpreset();
if(defpreset == NULL)
{
@@ -621,7 +621,7 @@ fluid_preset_t *fluid_defsfont_iteration_next(fluid_defsfont_t *defsfont)
* new_fluid_defpreset
*/
fluid_defpreset_t *
-new_fluid_defpreset(fluid_defsfont_t *defsfont)
+new_fluid_defpreset(void)
{
fluid_defpreset_t *defpreset = FLUID_NEW(fluid_defpreset_t);
@@ -632,7 +632,6 @@ new_fluid_defpreset(fluid_defsfont_t *defsfont)
}
defpreset->next = NULL;
- defpreset->defsfont = defsfont;
defpreset->name[0] = 0;
defpreset->bank = 0;
defpreset->num = 0;