From 38fc7fb027ea4120e03e238371bbb7877fb3ae27 Mon Sep 17 00:00:00 2001 From: derselbst Date: Mon, 4 Dec 2017 20:42:01 +0100 Subject: [PATCH] reorder public fluid_voice declarations --- include/fluidsynth/voice.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/fluidsynth/voice.h b/include/fluidsynth/voice.h index 2952721e..ed3f869a 100644 --- a/include/fluidsynth/voice.h +++ b/include/fluidsynth/voice.h @@ -35,7 +35,6 @@ extern "C" { * such as the SoundFont loader's noteon method. */ -FLUIDSYNTH_API void fluid_voice_update_param(fluid_voice_t* voice, int gen); /** * Enum used with fluid_voice_add_mod() to specify how to handle duplicate modulators. @@ -47,21 +46,22 @@ enum fluid_voice_add_mod { }; FLUIDSYNTH_API void fluid_voice_add_mod(fluid_voice_t* voice, fluid_mod_t* mod, int mode); -FLUIDSYNTH_API void fluid_voice_gen_set(fluid_voice_t* voice, int gen, float val); FLUIDSYNTH_API float fluid_voice_gen_get(fluid_voice_t* voice, int gen); +FLUIDSYNTH_API void fluid_voice_gen_set(fluid_voice_t* voice, int gen, float val); FLUIDSYNTH_API void fluid_voice_gen_incr(fluid_voice_t* voice, int gen, float val); FLUIDSYNTH_API unsigned int fluid_voice_get_id(const fluid_voice_t* voice); +FLUIDSYNTH_API int fluid_voice_get_channel(const fluid_voice_t* voice); +FLUIDSYNTH_API int fluid_voice_get_key(const fluid_voice_t* voice); +FLUIDSYNTH_API int fluid_voice_get_actual_key(const fluid_voice_t* voice); +FLUIDSYNTH_API int fluid_voice_get_velocity(const fluid_voice_t* voice); +FLUIDSYNTH_API int fluid_voice_get_actual_velocity(const fluid_voice_t* voice); FLUIDSYNTH_API int fluid_voice_is_playing(const fluid_voice_t* voice); FLUIDSYNTH_API int fluid_voice_is_on(const fluid_voice_t* voice); FLUIDSYNTH_API int fluid_voice_is_sustained(const fluid_voice_t* voice); FLUIDSYNTH_API int fluid_voice_is_sostenuto(const fluid_voice_t* voice); -FLUIDSYNTH_API int fluid_voice_get_channel(const fluid_voice_t* voice); -FLUIDSYNTH_API int fluid_voice_get_actual_key(const fluid_voice_t* voice); -FLUIDSYNTH_API int fluid_voice_get_key(const fluid_voice_t* voice); -FLUIDSYNTH_API int fluid_voice_get_actual_velocity(const fluid_voice_t* voice); -FLUIDSYNTH_API int fluid_voice_get_velocity(const fluid_voice_t* voice); -FLUIDSYNTH_API int fluid_voice_optimize_sample(fluid_sample_t* s); +FLUIDSYNTH_API int fluid_voice_optimize_sample(fluid_sample_t* s); +FLUIDSYNTH_API void fluid_voice_update_param(fluid_voice_t* voice, int gen); #ifdef __cplusplus