From 661da8e8028ff56af1c2424d3d158234d7a0d99c Mon Sep 17 00:00:00 2001 From: Krzysztof Foltman Date: Mon, 8 Nov 2010 22:33:02 +0000 Subject: [PATCH] Fix another install-related crash, this time due to invalid params in fluidsynth. (cherry picked from commit 034e3a47cd40eb6bb7d221274fda2a5c1c79f42f) --- plugins/ladspa_effect/calf/src/calf/metadata.h | 5 +---- plugins/ladspa_effect/calf/src/organ.cpp | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/plugins/ladspa_effect/calf/src/calf/metadata.h b/plugins/ladspa_effect/calf/src/calf/metadata.h index 68c004f67..f170bc2b7 100644 --- a/plugins/ladspa_effect/calf/src/calf/metadata.h +++ b/plugins/ladspa_effect/calf/src/calf/metadata.h @@ -350,9 +350,6 @@ struct organ_enums par_treblegain, param_count }; - enum { - var_count = 1 - }; enum organ_waveform { wave_sine, wave_sinepl1, wave_sinepl2, wave_sinepl3, @@ -411,7 +408,7 @@ public: /// FluidSynth - metadata struct fluidsynth_metadata: public plugin_metadata { - enum { par_master, par_interpolation, par_reverb, par_chorus, par_soundfont, par_preset_key_set, param_count }; + enum { par_master, par_interpolation, par_reverb, par_chorus, param_count }; enum { in_count = 0, out_count = 2, ins_optional = 0, outs_optional = 0, support_midi = true, require_midi = true, rt_capable = false }; PLUGIN_NAME_ID_LABEL("fluidsynth", "fluidsynth", "Fluidsynth") diff --git a/plugins/ladspa_effect/calf/src/organ.cpp b/plugins/ladspa_effect/calf/src/organ.cpp index bfd676099..c885eaf83 100644 --- a/plugins/ladspa_effect/calf/src/organ.cpp +++ b/plugins/ladspa_effect/calf/src/organ.cpp @@ -62,7 +62,7 @@ uint32_t organ_audio_module::process(uint32_t offset, uint32_t nsamples, uint32_ } void organ_audio_module::params_changed() { - for (int i = 0; i < param_count - var_count; i++) + for (int i = 0; i < param_count; i++) ((float *)&par_values)[i] = *params[i]; unsigned int old_poly = polyphony_limit;