[SCM] calf/master: Merge branch 'master' into filterclavier

[js at users.alioth.debian.org]

+ DSSI: implemented marshalling of line_graph_iface over OSC (apart from having stub implementation of cairo_iface it seems to work just fine), no background thread yet
+ Phaser: mark the graph-bearing port properly
* dssi_feedback_sender: added missing #if USE_DSSI
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 e541914f3f1c6a5a4510bc7edb1eb15854b9dd01
Merge: c5d73cd14ff974307abbd06c1ca9205781231ef2 aa30b898763be6c644453ae3d32cab859efed97d
Author: Hans Baier <hansfbaier at googlemail.com>
Date:   Thu Jan 22 07:30:35 2009 +0700

    Merge branch 'master' into filterclavier
    
    Conflicts:
    
    	src/giface.cpp

diff --combined src/modules.cpp
index 990924e,00064b0..4ccaac6
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@@ -54,7 -54,7 +54,7 @@@ CALF_PLUGIN_INFO(flanger) = { 0x847d, "
  CALF_PORT_NAMES(phaser) = {"In L", "In R", "Out L", "Out R"};
  
  CALF_PORT_PROPS(phaser) = {
-     { 1000,      20, 20000, 0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_HZ, NULL, "base_freq", "Center Freq" },
+     { 1000,      20, 20000, 0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_HZ | PF_PROP_GRAPH, NULL, "base_freq", "Center Freq" },
      { 4000,       0, 10800,  0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_CENTS, NULL, "mod_depth", "Modulation depth" },
      { 0.25,    0.01, 20,    0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_HZ, NULL, "mod_rate", "Modulation rate" },
      { 0.25,   -0.99, 0.99,  0, PF_FLOAT | PF_SCALE_PERC | PF_CTL_KNOB | PF_UNIT_COEF, NULL, "feedback", "Feedback" },
@@@ -111,30 -111,6 +111,30 @@@ CALF_PLUGIN_INFO(filter) = { 0x847f, "F
  
  ////////////////////////////////////////////////////////////////////////////
  
 +CALF_PORT_NAMES(filterclavier) = {"In L", "In R", "Out L", "Out R"};
 +
 +const char *filterclavier_choices[] = {
 +    "12dB/oct Lowpass",
 +    "24dB/oct Lowpass",
 +    "36dB/oct Lowpass",
 +    "12dB/oct Highpass",
 +    "24dB/oct Highpass",
 +    "36dB/oct Highpass",
 +};
 +
 +CALF_PORT_PROPS(filterclavier) = {
 +    { 2000,      10,20000,    0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_HZ | PF_PROP_GRAPH, NULL, "freq", "Frequency" },
 +    { 0,        -48,   48,   97, PF_INT   | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_SEMITONES, NULL, "transpose", "Transpose" },
 +    { 0,       -100,  100,    0, PF_FLOAT | PF_SCALE_LINEAR | PF_CTL_KNOB | PF_UNIT_CENTS, NULL, "detune", "Detune" },
 +    { 0.707,  0.707,   32,    0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_KNOB | PF_UNIT_COEF, NULL, "res", "Resonance" },
 +    { 0,          0,    5,    1, PF_ENUM | PF_CTL_COMBO, filterclavier_choices, "mode", "Mode" },
 +    { 20,         5,  100,   20, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_MSEC, NULL, "inertia", "Inertia"},
 +};
 +
 +CALF_PLUGIN_INFO(filterclavier) = { 0x849f, "Filterclavier", "Calf Filterclavier", "Krzysztof Foltman / Hans Baier", calf_plugins::calf_copyright_info, "FilterclavierPlugin" };
 +
 +////////////////////////////////////////////////////////////////////////////
 +
  CALF_PORT_NAMES(vintage_delay) = {"In L", "In R", "Out L", "Out R"};
  
  const char *vintage_delay_mixmodes[] = {

-- 
calf audio plugins packaging