From 15529d50a82738a802e4b1840150c8a4ef11e3d1 Mon Sep 17 00:00:00 2001 From: derselbst Date: Tue, 19 Apr 2022 22:15:18 +0200 Subject: [PATCH] Make MIDI Event API const correct --- doc/recent_changes.txt | 6 ++++++ include/fluidsynth/midi.h | 16 ++++++++-------- src/midi/fluid_midi.c | 16 ++++++++-------- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/doc/recent_changes.txt b/doc/recent_changes.txt index 33c7a12c..c564db83 100644 --- a/doc/recent_changes.txt +++ b/doc/recent_changes.txt @@ -1,6 +1,12 @@ /*! \page RecentChanges Recent Changes +\section NewIn2_2_7 What's new in 2.2.7? + +- Most getter functions of the MIDI event API are now const correct +- fluid_event_from_midi_event() has been added + + \section NewIn2_2_0 What's new in 2.2.0? - #fluid_file_callbacks_t now uses long long as file-offset type (see #fluid_long_long_t).This is a breaking change, which allows to load SoundFonts bigger than 2GiB on Windows. This change required to bump fluidsynth's SOVERSION. diff --git a/include/fluidsynth/midi.h b/include/fluidsynth/midi.h index 067db84e..cc3e435b 100644 --- a/include/fluidsynth/midi.h +++ b/include/fluidsynth/midi.h @@ -114,20 +114,20 @@ FLUIDSYNTH_API void delete_fluid_midi_event(fluid_midi_event_t *event); /** @endlifecycle */ FLUIDSYNTH_API int fluid_midi_event_set_type(fluid_midi_event_t *evt, int type); -FLUIDSYNTH_API int fluid_midi_event_get_type(fluid_midi_event_t *evt); +FLUIDSYNTH_API int fluid_midi_event_get_type(const fluid_midi_event_t *evt); FLUIDSYNTH_API int fluid_midi_event_set_channel(fluid_midi_event_t *evt, int chan); -FLUIDSYNTH_API int fluid_midi_event_get_channel(fluid_midi_event_t *evt); -FLUIDSYNTH_API int fluid_midi_event_get_key(fluid_midi_event_t *evt); +FLUIDSYNTH_API int fluid_midi_event_get_channel(const fluid_midi_event_t *evt); +FLUIDSYNTH_API int fluid_midi_event_get_key(const fluid_midi_event_t *evt); FLUIDSYNTH_API int fluid_midi_event_set_key(fluid_midi_event_t *evt, int key); -FLUIDSYNTH_API int fluid_midi_event_get_velocity(fluid_midi_event_t *evt); +FLUIDSYNTH_API int fluid_midi_event_get_velocity(const fluid_midi_event_t *evt); FLUIDSYNTH_API int fluid_midi_event_set_velocity(fluid_midi_event_t *evt, int vel); -FLUIDSYNTH_API int fluid_midi_event_get_control(fluid_midi_event_t *evt); +FLUIDSYNTH_API int fluid_midi_event_get_control(const fluid_midi_event_t *evt); FLUIDSYNTH_API int fluid_midi_event_set_control(fluid_midi_event_t *evt, int ctrl); -FLUIDSYNTH_API int fluid_midi_event_get_value(fluid_midi_event_t *evt); +FLUIDSYNTH_API int fluid_midi_event_get_value(const fluid_midi_event_t *evt); FLUIDSYNTH_API int fluid_midi_event_set_value(fluid_midi_event_t *evt, int val); -FLUIDSYNTH_API int fluid_midi_event_get_program(fluid_midi_event_t *evt); +FLUIDSYNTH_API int fluid_midi_event_get_program(const fluid_midi_event_t *evt); FLUIDSYNTH_API int fluid_midi_event_set_program(fluid_midi_event_t *evt, int val); -FLUIDSYNTH_API int fluid_midi_event_get_pitch(fluid_midi_event_t *evt); +FLUIDSYNTH_API int fluid_midi_event_get_pitch(const fluid_midi_event_t *evt); FLUIDSYNTH_API int fluid_midi_event_set_pitch(fluid_midi_event_t *evt, int val); FLUIDSYNTH_API int fluid_midi_event_set_sysex(fluid_midi_event_t *evt, void *data, int size, int dynamic); diff --git a/src/midi/fluid_midi.c b/src/midi/fluid_midi.c index cab651b8..89271cf3 100644 --- a/src/midi/fluid_midi.c +++ b/src/midi/fluid_midi.c @@ -1106,7 +1106,7 @@ delete_fluid_midi_event(fluid_midi_event_t *evt) * @return Event type field (MIDI status byte without channel) */ int -fluid_midi_event_get_type(fluid_midi_event_t *evt) +fluid_midi_event_get_type(const fluid_midi_event_t *evt) { return evt->type; } @@ -1130,7 +1130,7 @@ fluid_midi_event_set_type(fluid_midi_event_t *evt, int type) * @return Channel field */ int -fluid_midi_event_get_channel(fluid_midi_event_t *evt) +fluid_midi_event_get_channel(const fluid_midi_event_t *evt) { return evt->channel; } @@ -1154,7 +1154,7 @@ fluid_midi_event_set_channel(fluid_midi_event_t *evt, int chan) * @return MIDI note number (0-127) */ int -fluid_midi_event_get_key(fluid_midi_event_t *evt) +fluid_midi_event_get_key(const fluid_midi_event_t *evt) { return evt->param1; } @@ -1178,7 +1178,7 @@ fluid_midi_event_set_key(fluid_midi_event_t *evt, int v) * @return MIDI velocity number (0-127) */ int -fluid_midi_event_get_velocity(fluid_midi_event_t *evt) +fluid_midi_event_get_velocity(const fluid_midi_event_t *evt) { return evt->param2; } @@ -1202,7 +1202,7 @@ fluid_midi_event_set_velocity(fluid_midi_event_t *evt, int v) * @return MIDI control number */ int -fluid_midi_event_get_control(fluid_midi_event_t *evt) +fluid_midi_event_get_control(const fluid_midi_event_t *evt) { return evt->param1; } @@ -1226,7 +1226,7 @@ fluid_midi_event_set_control(fluid_midi_event_t *evt, int v) * @return Value field */ int -fluid_midi_event_get_value(fluid_midi_event_t *evt) +fluid_midi_event_get_value(const fluid_midi_event_t *evt) { return evt->param2; } @@ -1250,7 +1250,7 @@ fluid_midi_event_set_value(fluid_midi_event_t *evt, int v) * @return MIDI program number (0-127) */ int -fluid_midi_event_get_program(fluid_midi_event_t *evt) +fluid_midi_event_get_program(const fluid_midi_event_t *evt) { return evt->param1; } @@ -1274,7 +1274,7 @@ fluid_midi_event_set_program(fluid_midi_event_t *evt, int val) * @return Pitch value (14 bit value, 0-16383, 8192 is center) */ int -fluid_midi_event_get_pitch(fluid_midi_event_t *evt) +fluid_midi_event_get_pitch(const fluid_midi_event_t *evt) { return evt->param1; }