[SCM] calf/master: Merge commit 'origin/master' into compressor

[js at users.alioth.debian.org]

Merge branch 'bugfix-0.0.16'
+ AutoHell: add autom4te.cache to .gitignore
+ ChangeLog: update for 0.0.16.3
+ AutoHell: change version to 0.0.16.3
+ Framework: unbreak compilation without LV2 core installed
+ AutoHell: remove calf.desktop from this branch too, add calf.desktop and autom4te.cache to .gitignore
+ AutoHell: update version number to 0.0.16.2
+ ChangeLog: update to reflect DSSI GUI fix
+ MultiChorus: fix DSSI GUI too
+ ChangeLog: updated to 0.0.16.1 (also incremented version number in configure.ac)
+ MultiChorus: get LV2 GUI to work (continue using that nasty hack for now)
+ Knob: eat mouse wheel and pointer motion events so that they do not end up (for example) moving canvas unnecessarily
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 3db537a788b8992e4a0f9707d17e020ddfa12cb1
Merge: f91c7ca68ecb682adc86a9f8e44e8948995b2462 ce4d518f08df917351156120a7ecce4c66e090eb
Author: Thor Harald Johansen <thj at thj.no>
Date:   Thu Oct 30 21:28:22 2008 +0100

    Merge commit 'origin/master' into compressor

diff --combined src/modules.cpp
index df26038,b8e6359..f00f7aa
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@@ -31,7 -31,9 +31,9 @@@
  
  using namespace synth;
  
+ #if USE_LV2
  template<class Module> LV2_Descriptor lv2_small_wrapper<Module>::descriptor;
+ #endif
  
  const char *synth::calf_copyright_info = "(C) 2001-2008 Krzysztof Foltman, license: LGPL";
  
@@@ -171,16 -173,6 +173,16 @@@ parameter_properties multichorus_audio_
  
  synth::ladspa_plugin_info multichorus_audio_module::plugin_info = { 0x8501, "MultiChorus", "Calf MultiChorus", "Krzysztof Foltman", synth::calf_copyright_info, "ChorusPlugin" };
  
 +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,  0, PF_FLOAT | PF_SCALE_LOG | PF_CTL_KNOB | PF_UNIT_COEF, NULL, "ratio", "Ratio" },
 +    { 0,      0, 1,    0, PF_FLOAT | PF_SCALE_GAIN | PF_CTL_FADER | PF_UNIT_DB | PF_PROP_OUTPUT | PF_PROP_OPTIONAL, NULL, "compression", "Compression" }
 +};
 +
 +synth::ladspa_plugin_info compressor_audio_module::plugin_info = { 0x8502, "Compressor", "Calf Compressor", "Thor Harald Johansen", synth::calf_copyright_info, "CompressorPlugin" };
 +
 +const char *compressor_audio_module::port_names[] = {"In L", "In R", "Out L", "Out R"};
 +
  ////////////////////////////////////////////////////////////////////////////
  
  template<class Module>

-- 
calf audio plugins packaging