[SCM] calf/master: + Compressor: Changed RMS and Stereo Average into combo boxes.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit edff17f1ea0ce3ad2812a416df699ccea7b9176c
Author: Thor Harald Johansen <thj at thj.no>
Date:   Sat Nov 1 19:13:36 2008 +0100

    + Compressor: Changed RMS and Stereo Average into combo boxes.

diff --git a/src/calf/modules_dev.h b/src/calf/modules_dev.h
index a9b18e4..f61226f 100644
--- a/src/calf/modules_dev.h
+++ b/src/calf/modules_dev.h
@@ -30,7 +30,7 @@ private:
     float linslope, clip, peak;
 public:
     enum { in_count = 2, out_count = 2, support_midi = false, require_midi = false, rt_capable = true };
-    enum { param_threshold, param_ratio, param_attack, param_release, param_makeup, param_knee, param_rms, param_average, param_compression, param_peak, param_clip, param_bypass, param_count };
+    enum { param_threshold, param_ratio, param_attack, param_release, param_makeup, param_knee, param_detection, param_stereo_link, param_compression, param_peak, param_clip, param_bypass, param_count };
 
     static const char *port_names[in_count + out_count];
     static synth::ladspa_plugin_info plugin_info;
@@ -46,8 +46,8 @@ public:
     }
     uint32_t process(uint32_t offset, uint32_t numsamples, uint32_t inputs_mask, uint32_t outputs_mask) {
         bool bypass = *params[param_bypass] > 0.5f;
-        bool rms = *params[param_rms] > 0.5f;
-        bool average = *params[param_average] > 0.5f;
+        bool rms = *params[param_detection] == 0;
+        bool average = *params[param_stereo_link] == 1;
         float threshold = *params[param_threshold];
         float ratio = *params[param_ratio];
         float attack = *params[param_attack];
diff --git a/src/modules.cpp b/src/modules.cpp
index 456842c..ce909c8 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -175,6 +175,9 @@ synth::ladspa_plugin_info multichorus_audio_module::plugin_info = { 0x8501, "Mul
 
 #if ENABLE_EXPERIMENTAL
 
+const char *compressor_detection_names[] = { "RMS", "Peak" };
+const char *compressor_stereo_link_names[] = { "Maximum", "Average" };
+
 parameter_properties compressor_audio_module::param_props[] = {
     { 1,      0, 1,    0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_UNIT_DB, NULL, "threshold", "Threshold" },
     { 1,      1, 100,  101, PF_FLOAT | PF_SCALE_LOG_INF | PF_CTL_KNOB | PF_UNIT_COEF, NULL, "ratio", "Ratio" },
@@ -182,8 +185,8 @@ parameter_properties compressor_audio_module::param_props[] = {
     { 200,    0.01, 2000, 0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_MSEC, NULL, "release", "Release" },
     { 1,      1, 12,   0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_UNIT_DB, NULL, "makeup", "Makeup Gain" },
     { 1,      0,  1,   0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_UNIT_DB, NULL, "knee", "Knee" },
-    { 0,      0,  1,   0, PF_BOOL | PF_CTL_TOGGLE, NULL, "rms", "RMS" },
-    { 0,      0,  1,   0, PF_BOOL | PF_CTL_TOGGLE, NULL, "average", "Stereo Average" },
+    { 0,      0,  1,   0, PF_ENUM | PF_CTL_COMBO, compressor_detection_names, "detection", "Detection" },
+    { 0,      0,  1,   0, PF_ENUM | PF_CTL_COMBO, compressor_stereo_link_names, "stereo_link", "Stereo Link" },
     { 0, 0.03125, 1,    0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_METER | PF_CTLO_LABEL | PF_CTLO_REVERSE | PF_UNIT_DB | PF_PROP_OUTPUT | PF_PROP_OPTIONAL, NULL, "compression", "Compression" },
     { 0,      0,  1,    0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_METER | PF_CTLO_LABEL | PF_UNIT_DB | PF_PROP_OUTPUT | PF_PROP_OPTIONAL, NULL, "peak", "Peak" },
     { 0,      1,  0,    0, PF_BOOL | PF_CTL_LED | PF_PROP_OUTPUT | PF_PROP_OPTIONAL, NULL, "clip", "Clip" },

-- 
calf audio plugins packaging