[SCM] calf/master: Merge branch 'filterclavier' of git+ssh://hansfbaier at repo.or.cz/srv/git/calf into filterclavier

[js at users.alioth.debian.org]

+ Filter, Filterclavier: allow BP filters in Filter, use the same string array for both plugins, rename BP filters to reflect their true characteristics
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d6a3c1a63a147948535a50da009275278ad5e6a3
X-Git-Newrev: 34569260c452f0fa4c543155ebba174a42a343dc

The following commit has been merged in the master branch:
commit 204942536a31849fea58b92e173b56735c27bfa3
Merge: 02f3b8c85a466c7a38a651a566f7a425705eb62c 2a9da7c57190b85196600d6b32328ac6ab6e1048
Author: Hans Baier <hansfbaier at googlemail.com>
Date:   Fri Jan 23 10:17:14 2009 +0700

    Merge branch 'filterclavier' of git+ssh://hansfbaier@repo.or.cz/srv/git/calf into filterclavier
    
    Conflicts:
    
    	src/modules.cpp

diff --combined src/modules.cpp
index 0836f3a,ef93598..0c9642f
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@@ -26,7 -26,6 +26,7 @@@
  #endif
  #include <calf/giface.h>
  #include <calf/metadata.h>
 +#include <calf/audio_fx.h>
  
  using namespace dsp;
  using namespace calf_plugins;
@@@ -99,7 -98,7 +99,7 @@@ const char *filter_choices[] = 
      "12dB/oct Highpass",
      "24dB/oct Highpass",
      "36dB/oct Highpass",
 -    "6dB/oct Bandpass", 
 +    "6dB/oct Bandpass",
      "12dB/oct Bandpass",
      "18dB/oct Bandpass",
  };
@@@ -107,10 -106,7 +107,10 @@@
  CALF_PORT_PROPS(filter) = {
      { 2000,      10,20000,    0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_HZ | PF_PROP_GRAPH, NULL, "freq", "Frequency" },
      { 0.707,  0.707,   32,    0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_UNIT_COEF, NULL, "res", "Resonance" },
 -    { 0,          0,    8,    1, PF_ENUM | PF_CTL_COMBO, filter_choices, "mode", "Mode" },
 +    { biquad_filter_module::mode_12db_lp,
 +      biquad_filter_module::mode_12db_lp,
 +      biquad_filter_module::mode_count - 1,
 +                                1,  PF_ENUM | PF_CTL_COMBO, filter_choices, "mode", "Mode" },
      { 20,         5,  100,    20, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_MSEC, NULL, "inertia", "Inertia"},
  };
  
@@@ -118,33 -114,17 +118,21 @@@ CALF_PLUGIN_INFO(filter) = { 0x847f, "F
  
  ////////////////////////////////////////////////////////////////////////////
  
 +#if ENABLE_EXPERIMENTAL
  CALF_PORT_NAMES(filterclavier) = {"In L", "In R", "Out L", "Out R"};
  
  CALF_PORT_PROPS(filterclavier) = {
      { 0,        -48,   48, 48*2+1, PF_INT   | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_SEMITONES, NULL, "transpose", "Transpose" },
      { 0,       -100,  100,      0, PF_INT   | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_CENTS, NULL, "detune", "Detune" },
 -    { 6,          0,    8,      1, PF_ENUM  | PF_CTL_COMBO, filter_choices, "mode", "Mode" },
 +    { biquad_filter_module::mode_6db_bp, 
 +      biquad_filter_module::mode_12db_lp,
 +      biquad_filter_module::mode_count - 1,
-                                 1, PF_ENUM  | PF_CTL_COMBO, filterclavier_choices, "mode", "Mode" },
++                                1, PF_ENUM  | PF_CTL_COMBO, filter_choices, "mode", "Mode" },
      { 20,         1,  2000,    20, PF_FLOAT | PF_SCALE_LOG    | PF_CTL_KNOB | PF_UNIT_MSEC, NULL, "inertia", "Portamento time"}
  };
  
  CALF_PLUGIN_INFO(filterclavier) = { 0x849f, "Filterclavier", "Calf Filterclavier", "Krzysztof Foltman / Hans Baier", calf_plugins::calf_copyright_info, "FilterclavierPlugin" };
 -
 +#endif
  ////////////////////////////////////////////////////////////////////////////
  
  CALF_PORT_NAMES(vintage_delay) = {"In L", "In R", "Out L", "Out R"};

-- 
calf audio plugins packaging