From 75134e8ccf706208d4f4c1354444550ccf967408 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 23 Feb 2019 17:58:05 +0100 Subject: Update Fluidsynth to v2.0.4 see https://github.com/FluidSynth/fluidsynth/releases/tag/v2.0.4 --- tools/fluid-patches/ardour_fluidsynth.diff | 69 ++++++++++++------------------ 1 file changed, 27 insertions(+), 42 deletions(-) (limited to 'tools/fluid-patches') diff --git a/tools/fluid-patches/ardour_fluidsynth.diff b/tools/fluid-patches/ardour_fluidsynth.diff index a397680563..9ed5f38733 100644 --- a/tools/fluid-patches/ardour_fluidsynth.diff +++ b/tools/fluid-patches/ardour_fluidsynth.diff @@ -58,7 +58,7 @@ index 60f441c49..e6455186e 100644 fluid_real_t fluid_ct2hz_real(fluid_real_t cents); fluid_real_t fluid_ct2hz(fluid_real_t cents); diff --git b/libs/fluidsynth/src/fluid_hash.c a/libs/fluidsynth/src/fluid_hash.c -index 37b0a06a4..b6586895b 100644 +index 946a873bb..79f83a458 100644 --- b/libs/fluidsynth/src/fluid_hash.c +++ a/libs/fluidsynth/src/fluid_hash.c @@ -991,6 +991,7 @@ fluid_hashtable_remove_all(fluid_hashtable_t *hashtable) @@ -78,10 +78,10 @@ index 37b0a06a4..b6586895b 100644 /* * fluid_hashtable_foreach_remove_or_steal: diff --git b/libs/fluidsynth/src/fluid_midi.c a/libs/fluidsynth/src/fluid_midi.c -index 1a394f811..8deb0b0d1 100644 +index 38c2bf6ef..73551a6d8 100644 --- b/libs/fluidsynth/src/fluid_midi.c +++ a/libs/fluidsynth/src/fluid_midi.c -@@ -76,7 +76,7 @@ static int fluid_midi_file_read_tracklen(fluid_midi_file *mf); +@@ -77,7 +77,7 @@ static int fluid_midi_file_read_tracklen(fluid_midi_file *mf); static int fluid_midi_file_eot(fluid_midi_file *mf); static int fluid_midi_file_get_division(fluid_midi_file *midifile); @@ -90,7 +90,7 @@ index 1a394f811..8deb0b0d1 100644 /*************************************************************** * * MIDIFILE -@@ -1047,6 +1047,7 @@ fluid_midi_file_get_division(fluid_midi_file *midifile) +@@ -1054,6 +1054,7 @@ fluid_midi_file_get_division(fluid_midi_file *midifile) { return midifile->division; } @@ -98,7 +98,7 @@ index 1a394f811..8deb0b0d1 100644 /****************************************************** * -@@ -1413,7 +1414,7 @@ static void fluid_midi_event_get_sysex_LOCAL(fluid_midi_event_t *evt, void **dat +@@ -1420,7 +1421,7 @@ static void fluid_midi_event_get_sysex_LOCAL(fluid_midi_event_t *evt, void **dat * * fluid_track_t */ @@ -107,7 +107,7 @@ index 1a394f811..8deb0b0d1 100644 /* * new_fluid_track */ -@@ -2517,3 +2518,4 @@ fluid_midi_event_length(unsigned char event) +@@ -2524,3 +2525,4 @@ fluid_midi_event_length(unsigned char event) return 1; } @@ -139,13 +139,13 @@ index 3e7661741..ec8e967a3 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 af0ef75d1..9acc5f830 100644 +index 85c3fb914..5ea08ff6f 100644 --- b/libs/fluidsynth/src/fluid_rvoice_mixer.c +++ a/libs/fluidsynth/src/fluid_rvoice_mixer.c -@@ -24,7 +24,6 @@ +@@ -23,7 +23,6 @@ + #include "fluid_sys.h" #include "fluid_rev.h" #include "fluid_chorus.h" - #include "fluidsynth_priv.h" -#include "fluid_ladspa.h" #include "fluid_synth.h" @@ -163,7 +163,7 @@ index 4ee072e4b..1b3fceb34 100644 typedef struct _fluid_rvoice_mixer_t fluid_rvoice_mixer_t; diff --git b/libs/fluidsynth/src/fluid_settings.c a/libs/fluidsynth/src/fluid_settings.c -index 02be9a033..9207ab063 100644 +index 5b2b08748..181116984 100644 --- b/libs/fluidsynth/src/fluid_settings.c +++ a/libs/fluidsynth/src/fluid_settings.c @@ -21,9 +21,6 @@ @@ -191,7 +191,7 @@ index 02be9a033..9207ab063 100644 static int diff --git b/libs/fluidsynth/src/fluid_synth.c a/libs/fluidsynth/src/fluid_synth.c -index 07bfc0427..b4524a2ac 100644 +index 1c7a1f272..e26772073 100644 --- b/libs/fluidsynth/src/fluid_synth.c +++ a/libs/fluidsynth/src/fluid_synth.c @@ -267,7 +267,7 @@ void fluid_version(int *major, int *minor, int *micro) @@ -203,7 +203,7 @@ index 07bfc0427..b4524a2ac 100644 fluid_version_str(void) { return FLUIDSYNTH_VERSION; -@@ -6442,6 +6442,7 @@ int fluid_synth_set_channel_type(fluid_synth_t *synth, int chan, int type) +@@ -6411,6 +6411,7 @@ int fluid_synth_set_channel_type(fluid_synth_t *synth, int chan, int type) FLUID_API_RETURN(FLUID_OK); } @@ -211,7 +211,7 @@ index 07bfc0427..b4524a2ac 100644 /** * Return the LADSPA effects instance used by FluidSynth * -@@ -6454,6 +6455,7 @@ fluid_ladspa_fx_t *fluid_synth_get_ladspa_fx(fluid_synth_t *synth) +@@ -6423,6 +6424,7 @@ fluid_ladspa_fx_t *fluid_synth_get_ladspa_fx(fluid_synth_t *synth) return synth->ladspa_fx; } @@ -220,7 +220,7 @@ index 07bfc0427..b4524a2ac 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 156424af1..58869730c 100644 +index 46c92ccf6..9615cb1b5 100644 --- b/libs/fluidsynth/src/fluid_synth.h +++ a/libs/fluidsynth/src/fluid_synth.h @@ -33,8 +33,6 @@ @@ -243,10 +243,10 @@ index 156424af1..58869730c 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 d686737f6..28911ee7f 100644 +index b85fa3fbf..bcb86bac2 100644 --- b/libs/fluidsynth/src/fluid_sys.c +++ a/libs/fluidsynth/src/fluid_sys.c -@@ -202,9 +202,10 @@ fluid_log(int level, const char *fmt, ...) +@@ -205,9 +205,10 @@ fluid_log(int level, const char *fmt, ...) * @param delim String of delimiter chars. * @return Pointer to the next token or NULL if no more tokens. */ @@ -260,34 +260,10 @@ index d686737f6..28911ee7f 100644 if(str == NULL || delim == NULL || !*delim) diff --git b/libs/fluidsynth/src/fluid_sys.h a/libs/fluidsynth/src/fluid_sys.h -index 72b323029..122938655 100644 +index 9f2d6f6c7..e3a696741 100644 --- b/libs/fluidsynth/src/fluid_sys.h +++ a/libs/fluidsynth/src/fluid_sys.h -@@ -99,7 +99,7 @@ else \ - /* - * Utility functions - */ --char *fluid_strtok(char **str, char *delim); -+char *fluid_strtok(char **str, const char *delim); - - - #if defined(__OS2__) -diff --git b/libs/fluidsynth/src/fluidsynth_priv.h a/libs/fluidsynth/src/fluidsynth_priv.h -index 4df590e21..384785fcc 100644 ---- b/libs/fluidsynth/src/fluidsynth_priv.h -+++ a/libs/fluidsynth/src/fluidsynth_priv.h -@@ -26,10 +26,6 @@ - - #include "config.h" - --#if defined(__POWERPC__) && !(defined(__APPLE__) && defined(__MACH__)) --#include "config_maxmsp43.h" --#endif -- - #if HAVE_STRING_H - #include - #endif -@@ -133,8 +129,9 @@ typedef guint64 uint64_t; +@@ -128,8 +128,9 @@ typedef guint64 uint64_t; #endif #if defined(WIN32) && HAVE_WINDOWS_H @@ -299,3 +275,12 @@ index 4df590e21..384785fcc 100644 /* WIN32 special defines */ #define STDIN_FILENO 0 +@@ -187,7 +188,7 @@ typedef guint64 uint64_t; + /* + * Utility functions + */ +-char *fluid_strtok(char **str, char *delim); ++char *fluid_strtok(char **str, const char *delim); + + + #if defined(__OS2__) -- cgit v1.2.3