From 313c268e20bd1fa54d21f1c333a7b78ec70cf71d Mon Sep 17 00:00:00 2001
From: Krzysztof Foltman <wdev@foltman.com>
Date: Mon, 8 Nov 2010 21:08:03 +0000
Subject: [PATCH] Fix the infamous crash on install. (cherry picked from commit
 f0568e2f8a4c7d0003cc5a15e300aa2ebb3f93cb)

---
 plugins/ladspa_effect/calf/src/calf/giface.h   | 2 +-
 plugins/ladspa_effect/calf/src/calf/metadata.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/ladspa_effect/calf/src/calf/giface.h b/plugins/ladspa_effect/calf/src/calf/giface.h
index bc01da33a..3ee1309b3 100644
--- a/plugins/ladspa_effect/calf/src/calf/giface.h
+++ b/plugins/ladspa_effect/calf/src/calf/giface.h
@@ -625,7 +625,7 @@ public:
 };
 
 #define CALF_PORT_NAMES(name) template<> const char *::plugin_metadata<name##_metadata>::port_names[]
-#define CALF_PORT_PROPS(name) template<> parameter_properties plugin_metadata<name##_metadata>::param_props[]
+#define CALF_PORT_PROPS(name) template<> parameter_properties plugin_metadata<name##_metadata>::param_props[name##_metadata::param_count + 1]
 #define CALF_PLUGIN_INFO(name) template<> calf_plugins::ladspa_plugin_info plugin_metadata<name##_metadata>::plugin_info
 #define PLUGIN_NAME_ID_LABEL(name, id, label) \
     static const char *impl_get_name() { return name; } \
diff --git a/plugins/ladspa_effect/calf/src/calf/metadata.h b/plugins/ladspa_effect/calf/src/calf/metadata.h
index 2941df591..68c004f67 100644
--- a/plugins/ladspa_effect/calf/src/calf/metadata.h
+++ b/plugins/ladspa_effect/calf/src/calf/metadata.h
@@ -348,7 +348,6 @@ struct organ_enums
         par_bassgain,
         par_treblefreq,
         par_treblegain,
-        par_var_mapcurve,
         param_count
     };
     enum {