[SCM] calf/master: Merge branch 'style' into saturators

[js at users.alioth.debian.org]

Bass enhancer added
Distortion extracted, Enhancer, new tubes, recoloring in .rc
New widget: Tube with light and falloff
New Deesser, some minor bugs in sc-comp
Sidechain compressor bugs/settings, 3 equalizer
Minor bugs, sidechain frequency display
New FX: Sidechain compressor
New knobs, new scollbars
New button (big mama), VU-meters with falloff and hold, bug in delay (value)
Complete new theme based on clearlooks
In the middle of nowhere
Fully redesigned
Sidebars, GUI layouts, black buttons again, input knob for compressor
Added decoration graphics
Added 6 new LED's and peak hold function for VU-meters
meter_gain in gain_reduction module with falloff
New LED mode (red)
Modified knobs, toggle buttons, bg_color
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 d10b50b3ea6d5dbb8989ee380cfa5479bf3209d9
Merge: 653033d711b1d497d7d465f5ab9a61133c8653f6 c8e7f24facbd9a61857775777072596f2431c42b
Author: Markus Schmidt <schmidt at boomshop.net>
Date:   Fri Nov 13 06:54:49 2009 +0100

    Merge branch 'style' into saturators
    
    Conflicts:
    	src/calf/metadata.h
    	src/calf/modulelist.h
    	src/calf/modules.h
    	src/modules.cpp
    	src/modules_dsp.cpp
    
    Added manual merges for saturators

diff --combined src/calf/metadata.h
index 2ba9e02,26f1a4c..ad35275
--- a/src/calf/metadata.h
+++ b/src/calf/metadata.h
@@@ -234,7 -234,34 +234,35 @@@ struct equalizer12band_metadata: publi
             param_count };
      PLUGIN_NAME_ID_LABEL("equalizer12band", "equalizer12band", "Equalizer 12 Band")
  };
 +
+ /// Markus's Saturator - metadata
+ struct saturator_metadata: public plugin_metadata<saturator_metadata>
+ {
+     enum { in_count = 2, out_count = 2, ins_optional = 1, outs_optional = 1, support_midi = false, require_midi = false, rt_capable = true };
+     enum { param_bypass, param_level_in, param_level_out, param_mix, param_meter_in,
+            param_meter_out, param_clip_in, param_clip_out, param_drive, param_blend, param_meter_drive,
+            param_lp_pre_freq, param_hp_pre_freq, param_lp_post_freq, param_hp_post_freq,
+            param_p_freq, param_p_level, param_p_q, param_count };
+     PLUGIN_NAME_ID_LABEL("saturator", "saturator", "Saturator")
+ };
+ /// Markus's Exciter - metadata
+ struct exciter_metadata: public plugin_metadata<exciter_metadata>
+ {
+     enum { in_count = 2, out_count = 2, ins_optional = 1, outs_optional = 1, support_midi = false, require_midi = false, rt_capable = true };
+     enum { param_bypass, param_level_in, param_level_out, param_amount, param_meter_in,
+            param_meter_out, param_clip_in, param_clip_out, param_drive, param_blend, param_meter_drive,
+            param_freq, param_listen, param_count };
+     PLUGIN_NAME_ID_LABEL("exciter", "exciter", "Exciter")
+ };
+ /// Markus's Bass Enhancer - metadata
+ struct bassenhancer_metadata: public plugin_metadata<bassenhancer_metadata>
+ {
+     enum { in_count = 2, out_count = 2, ins_optional = 1, outs_optional = 1, support_midi = false, require_midi = false, rt_capable = true };
+     enum { param_bypass, param_level_in, param_level_out, param_amount, param_meter_in,
+            param_meter_out, param_clip_in, param_clip_out, param_drive, param_blend, param_meter_drive,
+            param_freq, param_listen, param_count };
+     PLUGIN_NAME_ID_LABEL("bassenhancer", "bassenhancer", "Bass Enhancer")
+ };
  /// Organ - enums for parameter IDs etc. (this mess is caused by organ split between plugin and generic class - which was
  /// a bad design decision and should be sorted out some day) XXXKF @todo
  struct organ_enums

-- 
calf audio plugins packaging