update fluidsynth to 2.1.1

fluidsynth/include/fluidsynth/audio.h

@@ -42,15 +42,20 @@ extern "C" {
 /**
  * Callback function type used with new_fluid_audio_driver2() to allow for
  * custom user audio processing before the audio is sent to the driver. This
- * function is responsible for rendering the audio to the buffers. For details
- * please refer to fluid_synth_process().
+ * function is responsible for rendering audio to the buffers.
+ * The buffers passed to this function are allocated and owned by the respective
+ * audio driver and are only valid during that specific call (do not cache them).
+ * For further details please refer to fluid_synth_process().
+ * @note Whereas fluid_synth_process() allows aliasing buffers, there is the guarentee that @p out
+ * and @p fx buffers provided by fluidsynth's audio drivers never alias. This prevents downstream
+ * applications from e.g. applying a custom effect accidentially to the same buffer multiple times.
  * @param data The user data parameter as passed to new_fluid_audio_driver2().
  * @param len Count of audio frames to synthesize.
  * @param nfx Count of arrays in \c fx.
  * @param fx Array of buffers to store effects audio to. Buffers may alias with buffers of \c out.
  * @param nout Count of arrays in \c out.
  * @param out Array of buffers to store (dry) audio to. Buffers may alias with buffers of \c fx.
- * @return Should return #FLUID_OK on success, #FLUID_FAILED if an error occured.
+ * @return Should return #FLUID_OK on success, #FLUID_FAILED if an error occurred.
  */
 typedef int (*fluid_audio_func_t)(void *data, int len,
                                   int nfx, float *fx[],

fluidsynth/include/fluidsynth/event.h

@@ -46,7 +46,7 @@ enum fluid_seq_event_type
     FLUID_SEQ_PROGRAMCHANGE,	/**< Program change message */
     FLUID_SEQ_PROGRAMSELECT,	/**< Program select message */
     FLUID_SEQ_PITCHBEND,		/**< Pitch bend message */
-    FLUID_SEQ_PITCHWHEELSENS,	/**< Pitch wheel sensitivity set message @since 1.1.0 was mispelled previously */
+    FLUID_SEQ_PITCHWHEELSENS,	/**< Pitch wheel sensitivity set message @since 1.1.0 was misspelled previously */
     FLUID_SEQ_MODULATION,		/**< Modulation controller event */
     FLUID_SEQ_SUSTAIN,		/**< Sustain controller event */
     FLUID_SEQ_CONTROLCHANGE,	/**< MIDI control change event */

fluidsynth/include/fluidsynth/ladspa.h

@@ -29,7 +29,7 @@ extern "C" {
  * @file ladspa.h
  * @brief Functions for manipulating the ladspa effects unit
  *
- * This header defines useful functions for programatically manipulating the ladspa
+ * This header defines useful functions for programmatically manipulating the ladspa
  * effects unit of the synth that can be retrieved via fluid_synth_get_ladspa_fx().
  *
  * Using any of those functions requires fluidsynth to be compiled with ladspa support.

fluidsynth/include/fluidsynth/seq.h

@@ -41,7 +41,7 @@ typedef void (*fluid_event_callback_t)(unsigned int time, fluid_event_t *event,
                                        fluid_sequencer_t *seq, void *data);
 
 
-FLUIDSYNTH_API fluid_sequencer_t *new_fluid_sequencer(void);
+FLUID_DEPRECATED FLUIDSYNTH_API fluid_sequencer_t *new_fluid_sequencer(void);
 FLUIDSYNTH_API fluid_sequencer_t *new_fluid_sequencer2(int use_system_timer);
 FLUIDSYNTH_API void delete_fluid_sequencer(fluid_sequencer_t *seq);
 FLUIDSYNTH_API int fluid_sequencer_get_use_system_timer(fluid_sequencer_t *seq);
@@ -64,14 +64,6 @@ FLUIDSYNTH_API unsigned int fluid_sequencer_get_tick(fluid_sequencer_t *seq);
 FLUIDSYNTH_API void fluid_sequencer_set_time_scale(fluid_sequencer_t *seq, double scale);
 FLUIDSYNTH_API double fluid_sequencer_get_time_scale(fluid_sequencer_t *seq);
 
-// Compile in internal traceing functions
-#define FLUID_SEQ_WITH_TRACE 0
-
-#if FLUID_SEQ_WITH_TRACE
-FLUIDSYNTH_API char *fluid_seq_gettrace(fluid_sequencer_t *seq);
-FLUIDSYNTH_API void fluid_seq_cleartrace(fluid_sequencer_t *seq);
-#endif
-
 #ifdef __cplusplus
 }
 #endif

fluidsynth/include/fluidsynth/sfont.h

@@ -73,15 +73,17 @@ enum
 
 /**
  * Indicates the type of a sample used by the _fluid_sample_t::sampletype field.
+ * This enum corresponds to the \c SFSampleLink enum in the SoundFont spec.
+ * One \c flag may be bit-wise OR-ed with one \c value.
  */
 enum fluid_sample_type
 {
-    FLUID_SAMPLETYPE_MONO = 0x1, /**< Used for mono samples */
-    FLUID_SAMPLETYPE_RIGHT = 0x2, /**< Used for right samples of a stereo pair */
-    FLUID_SAMPLETYPE_LEFT = 0x4, /**< Used for left samples of a stereo pair */
-    FLUID_SAMPLETYPE_LINKED = 0x8, /**< Currently not used */
-    FLUID_SAMPLETYPE_OGG_VORBIS = 0x10, /**< Used for Ogg Vorbis compressed samples @since 1.1.7 */
-    FLUID_SAMPLETYPE_ROM = 0x8000 /**< Indicates ROM samples, causes sample to be ignored */
+    FLUID_SAMPLETYPE_MONO = 0x1, /**< Value used for mono samples */
+    FLUID_SAMPLETYPE_RIGHT = 0x2, /**< Value used for right samples of a stereo pair */
+    FLUID_SAMPLETYPE_LEFT = 0x4, /**< Value used for left samples of a stereo pair */
+    FLUID_SAMPLETYPE_LINKED = 0x8, /**< Value used for linked sample, which is currently not supported */
+    FLUID_SAMPLETYPE_OGG_VORBIS = 0x10, /**< Flag used for Ogg Vorbis compressed samples (non-standard compliant extension) as found in the program "sftools" developed by Werner Schweer from MuseScore @since 1.1.7 */
+    FLUID_SAMPLETYPE_ROM = 0x8000 /**< Flag that indicates ROM samples, causing the sample to be ignored */
 };
 
 
@@ -90,7 +92,7 @@ enum fluid_sample_type
  * could be another type of string identifier that the \a loader understands).
  * @param loader SoundFont loader
  * @param filename File name or other string identifier
- * @return The loaded instrument file (SoundFont) or NULL if an error occured.
+ * @return The loaded instrument file (SoundFont) or NULL if an error occurred.
  */
 typedef fluid_sfont_t *(*fluid_sfloader_load_t)(fluid_sfloader_t *loader, const char *filename);
 
@@ -134,7 +136,7 @@ typedef int (* fluid_sfloader_callback_read_t)(void *buf, int count, void *handl
 typedef int (* fluid_sfloader_callback_seek_t)(void *handle, long offset, int origin);
 
 /**
- * Closes the handle returned by #fluid_sfloader_callback_open_t and frees used ressources.
+ * Closes the handle returned by #fluid_sfloader_callback_open_t and frees used resources.
  *
  * @return returns #FLUID_OK on success, #FLUID_FAILED on error
  */

fluidsynth/include/fluidsynth/synth.h

@@ -330,7 +330,7 @@ enum fluid_channel_breath_flags
 {
     FLUID_CHANNEL_BREATH_POLY = 0x10,  /**< when channel is poly, this flag indicates that the default velocity to initial attenuation modulator is replaced by a breath to initial attenuation modulator */
     FLUID_CHANNEL_BREATH_MONO = 0x20,  /**< when channel is mono, this flag indicates that the default velocity to initial attenuation modulator is replaced by a breath modulator */
-    FLUID_CHANNEL_BREATH_SYNC = 0x40,  /**< when channel is mono, this flag indicates that the breath controler(MSB)triggers noteon/noteoff on the running note */
+    FLUID_CHANNEL_BREATH_SYNC = 0x40,  /**< when channel is mono, this flag indicates that the breath controller(MSB)triggers noteon/noteoff on the running note */
 };
 
 /** Indicates the mode a basic channel is set to */

fluidsynth/include/fluidsynth/version.h

@@ -31,10 +31,10 @@ extern "C" {
  * @brief Library version functions and defines
  */
 
-#define FLUIDSYNTH_VERSION       "2.1.0"           /**< String constant of libfluidsynth version. */
+#define FLUIDSYNTH_VERSION       "2.1.1"           /**< String constant of libfluidsynth version. */
 #define FLUIDSYNTH_VERSION_MAJOR 2     /**< libfluidsynth major version integer constant. */
 #define FLUIDSYNTH_VERSION_MINOR 1     /**< libfluidsynth minor version integer constant. */
-#define FLUIDSYNTH_VERSION_MICRO 0     /**< libfluidsynth micro version integer constant. */
+#define FLUIDSYNTH_VERSION_MICRO 1     /**< libfluidsynth micro version integer constant. */
 
 FLUIDSYNTH_API void fluid_version(int *major, int *minor, int *micro);
 FLUIDSYNTH_API char* fluid_version_str(void);