smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-29 18:07:42 +01:00
Code Issues Projects Releases Wiki Activity

Update to fluidsynth-2.1

Browse source 
see https://github.com/FluidSynth/fluidsynth/releases/tag/v2.1.0

- new, less "ringing" reverb engine
- new, stereophonic chorus engine
- improved integrity checking of SoundFont modulators
...
This commit is contained in:
Robin Gareus 2019-12-02 23:58:15 +01:00
parent c5066dcf38
commit d425f6dcb5
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
23 changed files with 1329 additions and 619 deletions
Download patch file Download diff file Expand all files Collapse all files

37
tools/fluid-patches/ardour_fluidsynth.diff
View file

@ -1,7 +1,16 @@
diff --git b/libs/fluidsynth/fluidsynth/synth.h a/libs/fluidsynth/fluidsynth/synth.h
index 369a2c2615..87826809fd 100644
index f4802ee5b9..3003972542 100644
--- b/libs/fluidsynth/fluidsynth/synth.h
+++ a/libs/fluidsynth/fluidsynth/synth.h
@@ -176,7 +176,7 @@ FLUIDSYNTH_API int fluid_synth_count_effects_groups(fluid_synth_t *synth);
/* Synthesis parameters */
-FLUID_DEPRECATED FLUIDSYNTH_API void fluid_synth_set_sample_rate(fluid_synth_t *synth, float sample_rate);
+FLUIDSYNTH_API void fluid_synth_set_sample_rate(fluid_synth_t *synth, float sample_rate);
FLUIDSYNTH_API void fluid_synth_set_gain(fluid_synth_t *synth, float gain);
FLUIDSYNTH_API float fluid_synth_get_gain(fluid_synth_t *synth);
FLUIDSYNTH_API int fluid_synth_set_polyphony(fluid_synth_t *synth, int polyphony);
@@ -233,7 +233,7 @@ FLUIDSYNTH_API int fluid_synth_tuning_dump(fluid_synth_t *synth, int bank, int p
/* Misc */
@ -78,7 +87,7 @@ index 946a873bbf..79f83a4583 100644
/*
* fluid_hashtable_foreach_remove_or_steal:
diff --git b/libs/fluidsynth/src/fluid_midi.c a/libs/fluidsynth/src/fluid_midi.c
index cd0d23ced3..c92fb2fefa 100644
index ea1aff5202..844de01c8f 100644
--- b/libs/fluidsynth/src/fluid_midi.c
+++ a/libs/fluidsynth/src/fluid_midi.c
@@ -77,7 +77,7 @@ static int fluid_midi_file_read_tracklen(fluid_midi_file *mf);
@ -139,7 +148,7 @@ index 3e7661741f..ec8e967a35 100644
#ifdef DEBUG
void fluid_dump_modulator(fluid_mod_t *mod);
diff --git b/libs/fluidsynth/src/fluid_rvoice_mixer.c a/libs/fluidsynth/src/fluid_rvoice_mixer.c
index 85c3fb9142..5ea08ff6fa 100644
index 257f0fbdec..d7fd2f541f 100644
--- b/libs/fluidsynth/src/fluid_rvoice_mixer.c
+++ a/libs/fluidsynth/src/fluid_rvoice_mixer.c
@@ -23,7 +23,6 @@
@ -191,7 +200,7 @@ index 78532ad2a3..a825603a44 100644
static int
diff --git b/libs/fluidsynth/src/fluid_synth.c a/libs/fluidsynth/src/fluid_synth.c
index 3f602b88d1..570a2535cd 100644
index e03c64089f..382979f7f5 100644
--- b/libs/fluidsynth/src/fluid_synth.c
+++ a/libs/fluidsynth/src/fluid_synth.c
@@ -25,7 +25,6 @@
@ -202,7 +211,7 @@ index 3f602b88d1..570a2535cd 100644
#ifdef TRAP_ON_FPE
#define _GNU_SOURCE
@@ -263,7 +262,7 @@ void fluid_version(int *major, int *minor, int *micro)
@@ -262,7 +261,7 @@ void fluid_version(int *major, int *minor, int *micro)
* @return FluidSynth version string, which is internal and should not be
* modified or freed.
*/
@ -211,7 +220,7 @@ index 3f602b88d1..570a2535cd 100644
fluid_version_str(void)
{
return FLUIDSYNTH_VERSION;
@@ -5472,7 +5471,7 @@ fluid_synth_set_interp_method(fluid_synth_t *synth, int chan, int interp_method)
@@ -5558,7 +5557,7 @@ fluid_synth_set_interp_method(fluid_synth_t *synth, int chan, int interp_method)
}
FLUID_API_RETURN(FLUID_OK);
@ -220,7 +229,7 @@ index 3f602b88d1..570a2535cd 100644
/**
* Get the total count of MIDI channels.
@@ -6410,6 +6409,7 @@ int fluid_synth_set_channel_type(fluid_synth_t *synth, int chan, int type)
@@ -6496,6 +6495,7 @@ int fluid_synth_set_channel_type(fluid_synth_t *synth, int chan, int type)
FLUID_API_RETURN(FLUID_OK);
}
@ -228,7 +237,7 @@ index 3f602b88d1..570a2535cd 100644
/**
* Return the LADSPA effects instance used by FluidSynth
*
@@ -6422,6 +6422,7 @@ fluid_ladspa_fx_t *fluid_synth_get_ladspa_fx(fluid_synth_t *synth)
@@ -6508,6 +6508,7 @@ fluid_ladspa_fx_t *fluid_synth_get_ladspa_fx(fluid_synth_t *synth)
return synth->ladspa_fx;
}
@ -237,7 +246,7 @@ index 3f602b88d1..570a2535cd 100644
/**
* Configure a general-purpose IIR biquad filter.
diff --git b/libs/fluidsynth/src/fluid_synth.h a/libs/fluidsynth/src/fluid_synth.h
index 0b9758bad5..fe222f7b6f 100644
index b649bcf340..955b3fa12e 100644
--- b/libs/fluidsynth/src/fluid_synth.h
+++ a/libs/fluidsynth/src/fluid_synth.h
@@ -33,8 +33,6 @@
@ -260,10 +269,10 @@ index 0b9758bad5..fe222f7b6f 100644
enum fluid_iir_filter_flags custom_filter_flags; /**< filter type of the user-defined filter currently used for all voices */
};
diff --git b/libs/fluidsynth/src/fluid_sys.c a/libs/fluidsynth/src/fluid_sys.c
index 8128fbba91..f6c56d3995 100644
index 7454217dd2..c6300b90c2 100644
--- b/libs/fluidsynth/src/fluid_sys.c
+++ a/libs/fluidsynth/src/fluid_sys.c
@@ -216,9 +216,10 @@ void fluid_free(void* ptr)
@@ -239,9 +239,10 @@ void fluid_free(void* ptr)
* @param delim String of delimiter chars.
* @return Pointer to the next token or NULL if no more tokens.
*/
@ -277,10 +286,10 @@ index 8128fbba91..f6c56d3995 100644
if(str == NULL || delim == NULL || !*delim)
diff --git b/libs/fluidsynth/src/fluid_sys.h a/libs/fluidsynth/src/fluid_sys.h
index 6490359027..3bc0c5a40f 100644
index 24df6edb5b..b747e5676a 100644
--- b/libs/fluidsynth/src/fluid_sys.h
+++ a/libs/fluidsynth/src/fluid_sys.h
@@ -128,8 +128,9 @@ typedef guint64 uint64_t;
@@ -130,8 +130,9 @@ typedef gintptr intptr_t;
#endif
#if defined(WIN32) && HAVE_WINDOWS_H
@ -292,7 +301,7 @@ index 6490359027..3bc0c5a40f 100644
/* WIN32 special defines */
#define STDIN_FILENO 0
@@ -187,7 +188,7 @@ typedef guint64 uint64_t;
@@ -193,7 +194,7 @@ typedef gintptr intptr_t;
/*
* Utility functions
*/