diff --git a/doc/fluidsynth-v11-devdoc.txt b/doc/fluidsynth-v11-devdoc.txt index 01951a69..23d3bcfd 100644 --- a/doc/fluidsynth-v11-devdoc.txt +++ b/doc/fluidsynth-v11-devdoc.txt @@ -85,6 +85,7 @@ Changes in FluidSynth 2.0.0 concerning developers: - remove fluid_synth_set_gen2(), fluid_synth_set_gen() now behaves as fluid_synth_set_gen2() - remove struct fluid_mod_t from public API, use the getters and setters of mod.h instead - remove struct _fluid_gen_t, fluid_gen_set_default_values() and enum fluid_gen_flags from public API +- remove macro fluid_sfont_get_id() from public API

- all public \c fluid_settings_* functions that return an integer which is not meant to be interpreted as bool consistently return either FLUID_OK or FLUID_FAILED - all public delete_* functions return void and are safe when called with NULL diff --git a/include/fluidsynth/sfont.h b/include/fluidsynth/sfont.h index 4e617dbf..49b64b0f 100644 --- a/include/fluidsynth/sfont.h +++ b/include/fluidsynth/sfont.h @@ -191,7 +191,6 @@ struct _fluid_sfont_t { int (*iteration_next)(fluid_sfont_t* sfont, fluid_preset_t* preset); }; -#define fluid_sfont_get_id(_sf) ((_sf)->id) /** * Virtual SoundFont preset. diff --git a/src/sfloader/fluid_sfont.h b/src/sfloader/fluid_sfont.h index 434eac25..226d8d9a 100644 --- a/src/sfloader/fluid_sfont.h +++ b/src/sfloader/fluid_sfont.h @@ -32,6 +32,8 @@ #define delete_fluid_sfont(_sf) ( ((_sf) && (_sf)->free)? (*(_sf)->free)(_sf) : 0) + +#define fluid_sfont_get_id(_sf) ((_sf)->id) #define fluid_sfont_get_name(_sf) (*(_sf)->get_name)(_sf) #define fluid_sfont_get_preset(_sf,_bank,_prenum) (*(_sf)->get_preset)(_sf,_bank,_prenum) #define fluid_sfont_iteration_start(_sf) (*(_sf)->iteration_start)(_sf)