[SCM] calf/master: Fix another install-related crash, this time due to invalid params in fluidsynth.

js at users.alioth.debian.org js at users.alioth.debian.org
Tue May 7 15:40:28 UTC 2013


The following commit has been merged in the master branch:
commit 034e3a47cd40eb6bb7d221274fda2a5c1c79f42f
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Mon Nov 8 22:33:02 2010 +0000

    Fix another install-related crash, this time due to invalid params in fluidsynth.

diff --git a/src/calf/metadata.h b/src/calf/metadata.h
index 68c004f..f170bc2 100644
--- a/src/calf/metadata.h
+++ b/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<fluidsynth_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/src/organ.cpp b/src/organ.cpp
index bfd6760..c885eaf 100644
--- a/src/organ.cpp
+++ b/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;

-- 
calf audio plugins packaging



More information about the pkg-multimedia-commits mailing list