ardour/livetrax
13
0
Fork 0
Code

Follow fluidsynth's API changes introduced with 2.0.0

Browse Source 
Updated patch from Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller 2018-10-12 00:56:59 +02:00 committed by Robin Gareus
parent abf7905d5f
commit 5b03c41f6c
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/ardour/fluid_synth.cc
View File

@ -71,19 +71,18 @@ FluidSynth::load_sf2 (const std::string& fn)
}
size_t count;
fluid_preset_t preset;
fluid_preset_t* preset;
sfont->iteration_start (sfont);
for (count = 0; sfont->iteration_next (sfont, &preset) != 0; ++count) {
fluid_sfont_iteration_start (sfont);
for (count = 0; (preset = fluid_sfont_iteration_next (sfont)) != 0; ++count) {
if (count < 16) {
fluid_synth_program_select (_synth, count, _synth_id, preset.get_banknum (&preset), preset.get_num (&preset));
fluid_synth_program_select (_synth, count, _synth_id, fluid_preset_get_banknum (preset), fluid_preset_get_num (preset));
}
_presets.push_back (BankProgram (
preset.get_name (&preset),
preset.get_banknum (&preset),
preset.get_num (&preset)));
fluid_preset_get_name (preset),
fluid_preset_get_banknum (preset),
fluid_preset_get_num (preset)));
}
if (count == 0) {
return false;
}

24
libs/plugins/a-fluidsynth.lv2/a-fluidsynth.cc
View File

@ -184,23 +184,23 @@ load_sf2 (AFluidSynth* self, const char* fn)
}
int chn;
fluid_preset_t preset;
sfont->iteration_start (sfont);
fluid_preset_t *preset;
fluid_sfont_iteration_start (sfont);
pthread_mutex_lock (&self->bp_lock);
for (chn = 0; sfont->iteration_next (sfont, &preset); ++chn) {
for (chn = 0; (preset = fluid_sfont_iteration_next (sfont)); ++chn) {
if (chn < 16) {
fluid_synth_program_select (self->synth, chn, synth_id,
preset.get_banknum (&preset), preset.get_num (&preset));
fluid_preset_get_banknum (preset), fluid_preset_get_num (preset));
}
#ifndef LV2_EXTENDED
else { break ; }
#else
self->presets[preset.get_banknum (&preset)].push_back (
self->presets[fluid_preset_get_banknum (preset)].push_back (
BankProgram (
preset.get_name (&preset),
preset.get_banknum (&preset),
preset.get_num (&preset)));
#endif
fluid_preset_get_name (preset),
fluid_preset_get_banknum (preset),
fluid_preset_get_num (preset)));
#endif // LV2_EXTENDED
}
pthread_mutex_unlock (&self->bp_lock);
@ -681,9 +681,9 @@ work_response (LV2_Handle instance,
}
for (int chn = 0; chn < 16; ++chn) {
unsigned int sfid = 0;
unsigned int bank = 0;
unsigned int program = -1;
int sfid = 0;
int bank = 0;
int program = -1;
if (FLUID_OK == fluid_synth_get_program (self->synth, chn, &sfid, &bank, &program)) {
self->program_state[chn].bank = bank;
self->program_state[chn].program = program;