From 3b1a4ccad0afba0f50b464e6706177b468806831 Mon Sep 17 00:00:00 2001 From: derselbst Date: Mon, 27 Nov 2017 14:26:48 +0100 Subject: [PATCH] clarify API doc of fluid_synth_add_sfloader() --- include/fluidsynth/sfont.h | 2 +- src/synth/fluid_synth.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/fluidsynth/sfont.h b/include/fluidsynth/sfont.h index 90c92b04..4e617dbf 100644 --- a/include/fluidsynth/sfont.h +++ b/include/fluidsynth/sfont.h @@ -75,7 +75,7 @@ enum { * SoundFont loader structure. */ struct _fluid_sfloader_t { - void* data; /**< User defined data pointer */ + void* data; /**< User defined data pointer used by _fluid_sfloader_t::load() */ /** Callback structure specifying file operations used during soundfont loading to allow custom loading, such as from memory */ const fluid_file_callbacks_t* file_callbacks; diff --git a/src/synth/fluid_synth.c b/src/synth/fluid_synth.c index 266d759a..cf57fad2 100644 --- a/src/synth/fluid_synth.c +++ b/src/synth/fluid_synth.c @@ -3365,10 +3365,10 @@ fluid_synth_start_voice(fluid_synth_t* synth, fluid_voice_t* voice) } /** - * Add a SoundFont loader interface. + * Add a SoundFont loader to the synth. This function takes ownership of \c loader + * and frees it automatically upon \c synth destruction. * @param synth FluidSynth instance - * @param loader Loader API structure, used directly and should remain allocated - * as long as the synth instance is used. + * @param loader Loader API structure * * SoundFont loaders are used to add custom instrument loading to FluidSynth. * The caller supplied functions for loading files, allocating presets, @@ -3397,7 +3397,7 @@ fluid_synth_add_sfloader(fluid_synth_t* synth, fluid_sfloader_t* loader) * stack. Presets are searched starting from the SoundFont on the * top of the stack, working the way down the stack until a preset is found. * - * @param synth SoundFont instance + * @param synth FluidSynth instance * @param filename File to load * @param reset_presets TRUE to re-assign presets for all MIDI channels * @return SoundFont ID on success, FLUID_FAILED on error @@ -3470,7 +3470,7 @@ new_fluid_sfont_info (fluid_synth_t *synth, fluid_sfont_t *sfont) /** * Unload a SoundFont. - * @param synth SoundFont instance + * @param synth FluidSynth instance * @param id ID of SoundFont to unload * @param reset_presets TRUE to re-assign presets for all MIDI channels * @return FLUID_OK on success, FLUID_FAILED on error @@ -3559,7 +3559,7 @@ fluid_synth_sfunload_callback(void* data, unsigned int msec) /** * Reload a SoundFont. The SoundFont retains its ID and index on the SoundFont stack. - * @param synth SoundFont instance + * @param synth FluidSynth instance * @param id ID of SoundFont to reload * @return SoundFont ID on success, FLUID_FAILED on error */