tools/ardour_fluidsynth.diff

   1 diff --git a/libs/fluidsynth/src/fluid_defsfont.c b/libs/fluidsynth/src/fluid_defsfont.c
   2 index 3eea95c..c395218 100644
   3 --- a/libs/fluidsynth/src/fluid_defsfont.c
   4 +++ b/libs/fluidsynth/src/fluid_defsfont.c
   5 @@ -109,11 +109,13 @@ char* fluid_defsfont_sfont_get_name(fluid_sfont_t* sfont)
   6    return fluid_defsfont_get_name((fluid_defsfont_t*) sfont->data);
   7  }
   8
   9 +#if 0
  10  fluid_sample_t* fluid_defsfont_get_sample(fluid_defsfont_t* sfont, char *s)
  11  {
  12    /* This function is here just to avoid an ABI/SONAME bump, see ticket #98. Should never be used. */
  13    return NULL;
  14  }
  15 +#endif
  16
  17  fluid_preset_t*
  18  fluid_defsfont_sfont_get_preset(fluid_sfont_t* sfont, unsigned int bank, unsigned int prenum)
  19 diff --git a/libs/fluidsynth/src/fluid_hash.c b/libs/fluidsynth/src/fluid_hash.c
  20 index a063e29..9d5a920 100644
  21 --- a/libs/fluidsynth/src/fluid_hash.c
  22 +++ b/libs/fluidsynth/src/fluid_hash.c
  23 @@ -93,7 +93,7 @@ static const guint primes[] =
  24
  25  static const unsigned int nprimes = sizeof (primes) / sizeof (primes[0]);
  26
  27 -unsigned int
  28 +static unsigned int
  29  spaced_primes_closest (unsigned int num)
  30  {
  31    unsigned int i;
  32 @@ -984,6 +984,7 @@ fluid_hashtable_foreach_remove_or_steal (fluid_hashtable_t *hashtable,
  33    return deleted;
  34  }
  35
  36 +#if 0
  37  /**
  38   * fluid_hashtable_foreach_remove:
  39   * @hashtable: a #fluid_hashtable_t.
  40 @@ -1001,7 +1002,7 @@ fluid_hashtable_foreach_remove_or_steal (fluid_hashtable_t *hashtable,
  41   *
  42   * Return value: the number of key/value pairs removed.
  43   **/
  44 -unsigned int
  45 +static unsigned int
  46  fluid_hashtable_foreach_remove (fluid_hashtable_t *hashtable,
  47                                  fluid_hr_func_t func, void *user_data)
  48  {
  49 @@ -1010,6 +1011,7 @@ fluid_hashtable_foreach_remove (fluid_hashtable_t *hashtable,
  50
  51    return fluid_hashtable_foreach_remove_or_steal (hashtable, func, user_data, TRUE);
  52  }
  53 +#endif
  54
  55  /**
  56   * fluid_hashtable_foreach_steal:
  57 diff --git a/libs/fluidsynth/src/fluid_midi.c b/libs/fluidsynth/src/fluid_midi.c
  58 index 5ceab01..1ee3dd2 100644
  59 --- a/libs/fluidsynth/src/fluid_midi.c
  60 +++ b/libs/fluidsynth/src/fluid_midi.c
  61 @@ -1115,10 +1115,11 @@ fluid_track_get_duration(fluid_track_t *track)
  62      return time;
  63  }
  64
  65 +#if 0
  66  /*
  67   * fluid_track_count_events
  68   */
  69 -int
  70 +static int
  71  fluid_track_count_events(fluid_track_t *track, int *on, int *off)
  72  {
  73      fluid_midi_event_t *evt = track->first;
  74 @@ -1132,6 +1133,7 @@ fluid_track_count_events(fluid_track_t *track, int *on, int *off)
  75      }
  76      return FLUID_OK;
  77  }
  78 +#endif
  79
  80  /*
  81   * fluid_track_add_event
  82 @@ -1533,7 +1535,7 @@ fluid_player_load(fluid_player_t *player, fluid_playlist_item *item)
  83      return FLUID_OK;
  84  }
  85
  86 -void
  87 +static void
  88  fluid_player_advancefile(fluid_player_t *player)
  89  {
  90      if (player->playlist == NULL) {
  91 @@ -1553,7 +1555,7 @@ fluid_player_advancefile(fluid_player_t *player)
  92      }
  93  }
  94
  95 -void
  96 +static void
  97  fluid_player_playlist_load(fluid_player_t *player, unsigned int msec)
  98  {
  99      fluid_playlist_item* current_playitem;
 100 diff --git a/libs/fluidsynth/src/fluid_rev.c b/libs/fluidsynth/src/fluid_rev.c
 101 index 51b0e79..166007d 100644
 102 --- a/libs/fluidsynth/src/fluid_rev.c
 103 +++ b/libs/fluidsynth/src/fluid_rev.c
 104 @@ -75,7 +75,7 @@ void fluid_allpass_init(fluid_allpass* allpass);
 105  void fluid_allpass_setfeedback(fluid_allpass* allpass, fluid_real_t val);
 106  fluid_real_t fluid_allpass_getfeedback(fluid_allpass* allpass);
 107
 108 -void
 109 +static void
 110  fluid_allpass_setbuffer(fluid_allpass* allpass, int size)
 111  {
 112    allpass->bufidx = 0;
 113 @@ -83,7 +83,7 @@ fluid_allpass_setbuffer(fluid_allpass* allpass, int size)
 114    allpass->bufsize = size;
 115  }
 116
 117 -void
 118 +static void
 119  fluid_allpass_release(fluid_allpass* allpass)
 120  {
 121    FLUID_FREE(allpass->buffer);
 122 diff --git a/libs/fluidsynth/src/fluid_rvoice_mixer.c b/libs/fluidsynth/src/fluid_rvoice_mixer.c
 123 index 4672cb8..cc633f5 100644
 124 --- a/libs/fluidsynth/src/fluid_rvoice_mixer.c
 125 +++ b/libs/fluidsynth/src/fluid_rvoice_mixer.c
 126 @@ -24,7 +24,7 @@
 127  #include "fluid_rev.h"
 128  #include "fluid_chorus.h"
 129  #include "fluidsynth_priv.h"
 130 -#include "fluid_ladspa.h"
 131 +//#include "fluid_ladspa.h"
 132
 133  #define SYNTH_REVERB_CHANNEL 0
 134  #define SYNTH_CHORUS_CHANNEL 1
 135 diff --git a/libs/fluidsynth/src/fluid_rvoice_mixer.h b/libs/fluidsynth/src/fluid_rvoice_mixer.h
 136 index eeb49ec..d4e41ca 100644
 137 --- a/libs/fluidsynth/src/fluid_rvoice_mixer.h
 138 +++ b/libs/fluidsynth/src/fluid_rvoice_mixer.h
 139 @@ -24,7 +24,7 @@
 140
 141  #include "fluidsynth_priv.h"
 142  #include "fluid_rvoice.h"
 143 -#include "fluid_ladspa.h"
 144 +//#include "fluid_ladspa.h"
 145
 146  typedef struct _fluid_rvoice_mixer_t fluid_rvoice_mixer_t;
 147
 148 diff --git a/libs/fluidsynth/src/fluid_settings.c b/libs/fluidsynth/src/fluid_settings.c
 149 index 78725fb..2061c90 100644
 150 --- a/libs/fluidsynth/src/fluid_settings.c
 151 +++ b/libs/fluidsynth/src/fluid_settings.c
 152 @@ -22,9 +22,9 @@
 153  #include "fluid_sys.h"
 154  #include "fluid_hash.h"
 155  #include "fluid_synth.h"
 156 -#include "fluid_cmd.h"
 157 -#include "fluid_adriver.h"
 158 -#include "fluid_mdriver.h"
 159 +//#include "fluid_cmd.h"
 160 +//#include "fluid_adriver.h"
 161 +//#include "fluid_mdriver.h"
 162  #include "fluid_settings.h"
 163  #include "fluid_midi.h"
 164
 165 @@ -294,11 +294,13 @@ fluid_settings_init(fluid_settings_t* settings)
 166    fluid_return_if_fail (settings != NULL);
 167
 168    fluid_synth_settings(settings);
 169 -  fluid_shell_settings(settings);
 170 +  //fluid_shell_settings(settings);
 171    fluid_player_settings(settings);
 172 +#if 0
 173    fluid_file_renderer_settings(settings);
 174    fluid_audio_driver_settings(settings);
 175    fluid_midi_driver_settings(settings);
 176 +#endif
 177  }
 178
 179  static int
 180 diff --git a/libs/fluidsynth/src/fluid_synth.c b/libs/fluidsynth/src/fluid_synth.c
 181 index 84ee289..a12260c 100644
 182 --- a/libs/fluidsynth/src/fluid_synth.c
 183 +++ b/libs/fluidsynth/src/fluid_synth.c
 184 @@ -471,7 +471,7 @@ struct _fluid_sample_timer_t
 185  /*
 186   * fluid_sample_timer_process - called when synth->ticks is updated
 187   */
 188 -void fluid_sample_timer_process(fluid_synth_t* synth)
 189 +static void fluid_sample_timer_process(fluid_synth_t* synth)
 190  {
 191         fluid_sample_timer_t* st;
 192         long msec;
 193 diff --git a/libs/fluidsynth/src/fluid_synth.h b/libs/fluidsynth/src/fluid_synth.h
 194 index 3af336d..019a8e0 100644
 195 --- a/libs/fluidsynth/src/fluid_synth.h
 196 +++ b/libs/fluidsynth/src/fluid_synth.h
 197 @@ -37,8 +37,8 @@
 198  #include "fluid_rev.h"
 199  #include "fluid_voice.h"
 200  #include "fluid_chorus.h"
 201 -#include "fluid_ladspa.h"
 202 -#include "fluid_midi_router.h"
 203 +//#include "fluid_ladspa.h"
 204 +//#include "fluid_midi_router.h"
 205  #include "fluid_sys.h"
 206  #include "fluid_rvoice_event.h"
 207
 208 diff --git a/libs/fluidsynth/src/fluid_sys.c b/libs/fluidsynth/src/fluid_sys.c
 209 index ee7d8d9..600b04e 100644
 210 --- a/libs/fluidsynth/src/fluid_sys.c
 211 +++ b/libs/fluidsynth/src/fluid_sys.c
 212 @@ -686,7 +686,7 @@ fluid_thread_join(fluid_thread_t* thread)
 213  }
 214
 215
 216 -void
 217 +static void
 218  fluid_timer_run (void *data)
 219  {
 220    fluid_timer_t *timer;
 221 diff --git a/libs/fluidsynth/src/fluid_tuning.c b/libs/fluidsynth/src/fluid_tuning.c
 222 index cc440aa..8977ed6 100644
 223 --- a/libs/fluidsynth/src/fluid_tuning.c
 224 +++ b/libs/fluidsynth/src/fluid_tuning.c
 225 @@ -143,7 +143,7 @@ char* fluid_tuning_get_name(fluid_tuning_t* tuning)
 226    return tuning->name;
 227  }
 228
 229 -void fluid_tuning_set_key(fluid_tuning_t* tuning, int key, double pitch)
 230 +static void fluid_tuning_set_key(fluid_tuning_t* tuning, int key, double pitch)
 231  {
 232    tuning->pitch[key] = pitch;
 233  }
 234 diff --git a/libs/fluidsynth/src/fluidsynth_priv.h b/libs/fluidsynth/src/fluidsynth_priv.h
 235 index faf2772..74b9f4b 100644
 236 --- a/libs/fluidsynth/src/fluidsynth_priv.h
 237 +++ b/libs/fluidsynth/src/fluidsynth_priv.h
 238 @@ -28,14 +28,6 @@
 239  #include "config.h"
 240  #endif
 241
 242 -#if defined(__POWERPC__) && !(defined(__APPLE__) && defined(__MACH__))
 243 -#include "config_maxmsp43.h"
 244 -#endif
 245 -
 246 -#if defined(WIN32) && !defined(MINGW32)
 247 -#include "config_win32.h"
 248 -#endif
 249 -
 250  #if HAVE_STRING_H
 251  #include <string.h>
 252  #endif