tools/fluid-patches/ardour_fluidsynth.diff

   1 diff --git b/libs/fluidsynth/fluidsynth/synth.h a/libs/fluidsynth/fluidsynth/synth.h
   2 index 369a2c261..87826809f 100644
   3 --- b/libs/fluidsynth/fluidsynth/synth.h
   4 +++ a/libs/fluidsynth/fluidsynth/synth.h
   5 @@ -233,7 +233,7 @@ FLUIDSYNTH_API int fluid_synth_tuning_dump(fluid_synth_t *synth, int bank, int p
   6  /* Misc */
   7
   8  FLUIDSYNTH_API double fluid_synth_get_cpu_load(fluid_synth_t *synth);
   9 -FLUID_DEPRECATED FLUIDSYNTH_API const char *fluid_synth_error(fluid_synth_t *synth);
  10 +const char *fluid_synth_error(fluid_synth_t *synth);
  11
  12
  13  /* Default modulators */
  14 @@ -265,7 +265,7 @@ FLUIDSYNTH_API int fluid_synth_write_s16(fluid_synth_t *synth, int len,
  15  FLUIDSYNTH_API int fluid_synth_write_float(fluid_synth_t *synth, int len,
  16          void *lout, int loff, int lincr,
  17          void *rout, int roff, int rincr);
  18 -FLUID_DEPRECATED FLUIDSYNTH_API int fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
  19 +FLUIDSYNTH_API int fluid_synth_nwrite_float(fluid_synth_t *synth, int len,
  20          float **left, float **right,
  21          float **fx_left, float **fx_right);
  22  FLUIDSYNTH_API int fluid_synth_process(fluid_synth_t *synth, int len,
  23 @@ -310,7 +310,9 @@ FLUIDSYNTH_API int fluid_synth_set_custom_filter(fluid_synth_t *, int type, int
  24
  25  /* LADSPA */
  26
  27 +#ifdef LADSPA
  28  FLUIDSYNTH_API fluid_ladspa_fx_t *fluid_synth_get_ladspa_fx(fluid_synth_t *synth);
  29 +#endif
  30
  31
  32  /* API: Poly mono mode */
  33 diff --git b/libs/fluidsynth/fluidsynth/types.h a/libs/fluidsynth/fluidsynth/types.h
  34 index 47ef18336..5ad29281a 100644
  35 --- b/libs/fluidsynth/fluidsynth/types.h
  36 +++ a/libs/fluidsynth/fluidsynth/types.h
  37 @@ -56,7 +56,9 @@ typedef struct _fluid_sequencer_t fluid_sequencer_t;            /**< Sequencer i
  38  typedef struct _fluid_ramsfont_t fluid_ramsfont_t;              /**< RAM SoundFont */
  39  typedef struct _fluid_rampreset_t fluid_rampreset_t;            /**< RAM SoundFont preset */
  40  typedef struct _fluid_cmd_handler_t fluid_cmd_handler_t;        /**< Shell Command Handler */
  41 +#ifdef LADSPA
  42  typedef struct _fluid_ladspa_fx_t fluid_ladspa_fx_t;            /**< LADSPA effects instance */
  43 +#endif
  44  typedef struct _fluid_file_callbacks_t fluid_file_callbacks_t;  /**< Callback struct to perform custom file loading of soundfonts */
  45
  46  typedef int fluid_istream_t;    /**< Input stream descriptor */
  47 diff --git b/libs/fluidsynth/src/fluid_conv.h a/libs/fluidsynth/src/fluid_conv.h
  48 index 60f441c49..e6455186e 100644
  49 --- b/libs/fluidsynth/src/fluid_conv.h
  50 +++ a/libs/fluidsynth/src/fluid_conv.h
  51 @@ -22,7 +22,7 @@
  52  #define _FLUID_CONV_H
  53
  54  #include "fluidsynth_priv.h"
  55 -#include "utils/fluid_conv_tables.h"
  56 +#include "fluid_conv_tables.h"
  57
  58  fluid_real_t fluid_ct2hz_real(fluid_real_t cents);
  59  fluid_real_t fluid_ct2hz(fluid_real_t cents);
  60 diff --git b/libs/fluidsynth/src/fluid_hash.c a/libs/fluidsynth/src/fluid_hash.c
  61 index 37b0a06a4..b6586895b 100644
  62 --- b/libs/fluidsynth/src/fluid_hash.c
  63 +++ a/libs/fluidsynth/src/fluid_hash.c
  64 @@ -991,6 +991,7 @@ fluid_hashtable_remove_all(fluid_hashtable_t *hashtable)
  65      fluid_hashtable_maybe_resize(hashtable);
  66  }
  67
  68 +#if 0
  69  /**
  70   * fluid_hashtable_steal_all:
  71   * @hashtable: a #fluid_hashtable_t.
  72 @@ -1008,6 +1009,7 @@ fluid_hashtable_steal_all(fluid_hashtable_t *hashtable)
  73      fluid_hashtable_remove_all_nodes(hashtable, FALSE);
  74      fluid_hashtable_maybe_resize(hashtable);
  75  }
  76 +#endif
  77
  78  /*
  79   * fluid_hashtable_foreach_remove_or_steal:
  80 diff --git b/libs/fluidsynth/src/fluid_midi.c a/libs/fluidsynth/src/fluid_midi.c
  81 index 4795fceb3..b82bfdf61 100644
  82 --- b/libs/fluidsynth/src/fluid_midi.c
  83 +++ a/libs/fluidsynth/src/fluid_midi.c
  84 @@ -75,7 +75,7 @@ static int fluid_midi_file_read_tracklen(fluid_midi_file *mf);
  85  static int fluid_midi_file_eot(fluid_midi_file *mf);
  86  static int fluid_midi_file_get_division(fluid_midi_file *midifile);
  87
  88 -
  89 +#if 0 // disable file I/O with Ardour
  90  /***************************************************************
  91   *
  92   *                      MIDIFILE
  93 @@ -1011,6 +1011,7 @@ fluid_midi_file_get_division(fluid_midi_file *midifile)
  94  {
  95      return midifile->division;
  96  }
  97 +#endif
  98
  99  /******************************************************
 100   *
 101 @@ -1330,7 +1331,7 @@ static void fluid_midi_event_set_sysex_LOCAL(fluid_midi_event_t *evt, int type,
 102   *
 103   *     fluid_track_t
 104   */
 105 -
 106 +#if 0 // disable fluid file player in Ardour
 107  /*
 108   * new_fluid_track
 109   */
 110 @@ -2434,3 +2435,4 @@ fluid_midi_event_length(unsigned char event)
 111
 112      return 1;
 113  }
 114 +#endif
 115 diff --git b/libs/fluidsynth/src/fluid_rev.c a/libs/fluidsynth/src/fluid_rev.c
 116 index 198a06e58..894afc5a0 100644
 117 --- b/libs/fluidsynth/src/fluid_rev.c
 118 +++ a/libs/fluidsynth/src/fluid_rev.c
 119 @@ -51,7 +51,7 @@ void fluid_allpass_init(fluid_allpass *allpass);
 120  void fluid_allpass_setfeedback(fluid_allpass *allpass, fluid_real_t val);
 121  fluid_real_t fluid_allpass_getfeedback(fluid_allpass *allpass);
 122
 123 -void
 124 +static void
 125  fluid_allpass_setbuffer(fluid_allpass *allpass, int size)
 126  {
 127      allpass->bufidx = 0;
 128 @@ -59,7 +59,7 @@ fluid_allpass_setbuffer(fluid_allpass *allpass, int size)
 129      allpass->bufsize = size;
 130  }
 131
 132 -void
 133 +static void
 134  fluid_allpass_release(fluid_allpass *allpass)
 135  {
 136      FLUID_FREE(allpass->buffer);
 137 diff --git b/libs/fluidsynth/src/fluid_rvoice_mixer.c a/libs/fluidsynth/src/fluid_rvoice_mixer.c
 138 index af0ef75d1..9e7b164bb 100644
 139 --- b/libs/fluidsynth/src/fluid_rvoice_mixer.c
 140 +++ a/libs/fluidsynth/src/fluid_rvoice_mixer.c
 141 @@ -24,7 +24,6 @@
 142  #include "fluid_rev.h"
 143  #include "fluid_chorus.h"
 144  #include "fluidsynth_priv.h"
 145 -#include "fluid_ladspa.h"
 146  #include "fluid_synth.h"
 147
 148
 149  // If less than x voices, the thread overhead is larger than the gain,
 150 diff --git b/libs/fluidsynth/src/fluid_rvoice_mixer.h a/libs/fluidsynth/src/fluid_rvoice_mixer.h
 151 index 4ee072e4b..1b3fceb34 100644
 152 --- b/libs/fluidsynth/src/fluid_rvoice_mixer.h
 153 +++ a/libs/fluidsynth/src/fluid_rvoice_mixer.h
 154 @@ -24,7 +24,6 @@
 155
 156  #include "fluidsynth_priv.h"
 157  #include "fluid_rvoice.h"
 158 -#include "fluid_ladspa.h"
 159
 160  typedef struct _fluid_rvoice_mixer_t fluid_rvoice_mixer_t;
 161
 162 diff --git b/libs/fluidsynth/src/fluid_settings.c a/libs/fluidsynth/src/fluid_settings.c
 163 index 02be9a033..9207ab063 100644
 164 --- b/libs/fluidsynth/src/fluid_settings.c
 165 +++ a/libs/fluidsynth/src/fluid_settings.c
 166 @@ -21,9 +21,6 @@
 167  #include "fluid_sys.h"
 168  #include "fluid_hash.h"
 169  #include "fluid_synth.h"
 170 -#include "fluid_cmd.h"
 171 -#include "fluid_adriver.h"
 172 -#include "fluid_mdriver.h"
 173  #include "fluid_settings.h"
 174  #include "fluid_midi.h"
 175
 176 @@ -328,11 +325,13 @@ fluid_settings_init(fluid_settings_t *settings)
 177      fluid_return_if_fail(settings != NULL);
 178
 179      fluid_synth_settings(settings);
 180 +#if 0
 181      fluid_shell_settings(settings);
 182      fluid_player_settings(settings);
 183      fluid_file_renderer_settings(settings);
 184      fluid_audio_driver_settings(settings);
 185      fluid_midi_driver_settings(settings);
 186 +#endif
 187  }
 188
 189  static int
 190 diff --git b/libs/fluidsynth/src/fluid_synth.c a/libs/fluidsynth/src/fluid_synth.c
 191 index faadefb27..79c5a9c87 100644
 192 --- b/libs/fluidsynth/src/fluid_synth.c
 193 +++ a/libs/fluidsynth/src/fluid_synth.c
 194 @@ -267,7 +267,7 @@ void fluid_version(int *major, int *minor, int *micro)
 195   * @return FluidSynth version string, which is internal and should not be
 196   *   modified or freed.
 197   */
 198 -char *
 199 +const char *
 200  fluid_version_str(void)
 201  {
 202      return FLUIDSYNTH_VERSION;
 203 @@ -6430,6 +6430,7 @@ int fluid_synth_set_channel_type(fluid_synth_t *synth, int chan, int type)
 204      FLUID_API_RETURN(FLUID_OK);
 205  }
 206
 207 +#ifdef LADSPA
 208  /**
 209   * Return the LADSPA effects instance used by FluidSynth
 210   *
 211 @@ -6442,6 +6443,7 @@ fluid_ladspa_fx_t *fluid_synth_get_ladspa_fx(fluid_synth_t *synth)
 212
 213      return synth->ladspa_fx;
 214  }
 215 +#endif
 216
 217  /**
 218   * Configure a general-purpose IIR biquad filter.
 219 diff --git b/libs/fluidsynth/src/fluid_synth.h a/libs/fluidsynth/src/fluid_synth.h
 220 index 156424af1..58869730c 100644
 221 --- b/libs/fluidsynth/src/fluid_synth.h
 222 +++ a/libs/fluidsynth/src/fluid_synth.h
 223 @@ -33,8 +33,6 @@
 224  #include "fluid_rev.h"
 225  #include "fluid_voice.h"
 226  #include "fluid_chorus.h"
 227 -#include "fluid_ladspa.h"
 228 -#include "fluid_midi_router.h"
 229  #include "fluid_rvoice_event.h"
 230
 231  /***************************************************************
 232 @@ -165,7 +163,9 @@ struct _fluid_synth_t
 233
 234      fluid_mod_t *default_mod;          /**< the (dynamic) list of default modulators */
 235
 236 +#ifdef LADSPA
 237      fluid_ladspa_fx_t *ladspa_fx;      /**< Effects unit for LADSPA support */
 238 +#endif
 239      enum fluid_iir_filter_type custom_filter_type; /**< filter type of the user-defined filter currently used for all voices */
 240      enum fluid_iir_filter_flags custom_filter_flags; /**< filter type of the user-defined filter currently used for all voices */
 241  };
 242 diff --git b/libs/fluidsynth/src/fluid_sys.c a/libs/fluidsynth/src/fluid_sys.c
 243 index 3df88fc23..cce778b3c 100644
 244 --- b/libs/fluidsynth/src/fluid_sys.c
 245 +++ a/libs/fluidsynth/src/fluid_sys.c
 246 @@ -202,9 +202,10 @@ fluid_log(int level, const char *fmt, ...)
 247   * @param delim String of delimiter chars.
 248   * @return Pointer to the next token or NULL if no more tokens.
 249   */
 250 -char *fluid_strtok(char **str, char *delim)
 251 +char *fluid_strtok(char **str, const char *delim)
 252  {
 253 -    char *s, *d, *token;
 254 +    char *s,  *token;
 255 +               const char *d;
 256      char c;
 257
 258      if(str == NULL || delim == NULL || !*delim)
 259 diff --git b/libs/fluidsynth/src/fluid_sys.h a/libs/fluidsynth/src/fluid_sys.h
 260 index 47cc95c11..d95f6159f 100644
 261 --- b/libs/fluidsynth/src/fluid_sys.h
 262 +++ a/libs/fluidsynth/src/fluid_sys.h
 263 @@ -91,7 +91,7 @@ else \
 264  /*
 265   * Utility functions
 266   */
 267 -char *fluid_strtok(char **str, char *delim);
 268 +char *fluid_strtok(char **str, const char *delim);
 269
 270
 271  #if defined(__OS2__)
 272 diff --git b/libs/fluidsynth/src/fluidsynth_priv.h a/libs/fluidsynth/src/fluidsynth_priv.h
 273 index d5dbdf7e9..5de758dc0 100644
 274 --- b/libs/fluidsynth/src/fluidsynth_priv.h
 275 +++ a/libs/fluidsynth/src/fluidsynth_priv.h
 276 @@ -26,10 +26,6 @@
 277
 278  #include "config.h"
 279
 280 -#if defined(__POWERPC__) && !(defined(__APPLE__) && defined(__MACH__))
 281 -#include "config_maxmsp43.h"
 282 -#endif
 283 -
 284  #if HAVE_STRING_H
 285  #include <string.h>
 286  #endif
 287 @@ -133,8 +129,9 @@ typedef guint64  uint64_t;
 288  #endif
 289
 290  #if defined(WIN32) &&  HAVE_WINDOWS_H
 291 -#include <winsock2.h>
 292 -#include <ws2tcpip.h>  /* Provides also socklen_t */
 293 +//#include <winsock2.h>
 294 +//#include <ws2tcpip.h>        /* Provides also socklen_t */
 295 +#include <windows.h>
 296
 297  /* WIN32 special defines */
 298  #define STDIN_FILENO 0