[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]

The following commit has been merged in the master branch:
commit b2a45d609873f050be0b6b12074b11e07a2c189f
Merge: a8f7cbf36b055e4765035f0584e50bb53c0af77a 76e4cd1c0814040a2e2c847ba3452b641d22e823
Author: Hans Baier <hansfbaier at googlemail.com>
Date:   Thu Jan 22 11:46:43 2009 +0700

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

diff --combined gui/gui-filterclavier.xml
index b3f0fef,7adfc2f..b1aad30
--- a/gui/gui-filterclavier.xml
+++ b/gui/gui-filterclavier.xml
@@@ -6,16 -6,26 +6,21 @@@
      </table>
      <hbox attach-x="0" attach-y="1" shrink-y="1" expand-x="1" fill-x="1">
          <vbox border="10">
 -            <label param="freq" />
 -            <knob param="freq" />
 -            <value param="freq" />
 +            <label param="transpose" />
 +            <knob param="transpose" type="1"/>
 +            <value param="transpose" />
          </vbox>
          <vbox border="10">
+             <label param="transpose" />
+             <knob param="transpose" type="1"/>
+             <value param="transpose" />
+         </vbox>
+         <vbox border="10">
              <label param="detune" />
              <knob param="detune" type="1"/>
              <value param="detune" />
          </vbox>
          <vbox border="10">
 -            <label param="res" />
 -            <knob param="res" />
 -            <value param="res" />
 -        </vbox>
 -        <vbox border="10">
              <label param="inertia" />
              <knob param="inertia"/>
              <value param="inertia" />
@@@ -23,7 -33,7 +28,7 @@@
      </hbox>
      <if cond="directlink">
          <frame label="Freq. response" expand-x="1" fill-x="1" attach-x="0" attach-y="2">
 -            <line-graph refresh="1" width="160" height="160" param="freq"/>
 +            <line-graph refresh="1" width="160" height="160"/>
          </frame>
      </if>
  </table>
diff --combined src/calf/metadata.h
index bfc95bc,6016b28..d45cd41
--- a/src/calf/metadata.h
+++ b/src/calf/metadata.h
@@@ -51,16 -51,6 +51,16 @@@ struct filter_metadata: public plugin_m
      bool is_cv(int param_no) { return param_no != par_mode && param_no != par_inertia; }
  };
  
 +/// Filterclavier - metadata
 +struct filterclavier_metadata: public plugin_metadata<filterclavier_metadata>
 +{
 +    enum { par_transpose, par_detune, par_mode, par_inertia,  param_count };
 +    enum { in_count = 2, out_count = 2, rt_capable = true, require_midi = true, support_midi = true };
 +    PLUGIN_NAME_ID_LABEL("filterclavier", "filterclavier", "Filterclavier")
 +    /// do not export mode and inertia as CVs, as those are settings and not parameters
 +    bool is_cv(int param_no) { return param_no != par_mode && param_no != par_inertia; }
 +};
 +
  struct reverb_metadata: public plugin_metadata<reverb_metadata>
  {
      enum { par_decay, par_hfdamp, par_roomsize, par_diffusion, par_amount, par_dry, par_predelay, par_basscut, par_treblecut, param_count };
@@@ -102,6 -92,16 +102,19 @@@ struct monosynth_metadata: public plugi
      enum { step_size = 64 };
      PLUGIN_NAME_ID_LABEL("monosynth", "monosynth", "Monosynth")
  };
++<<<<<<< HEAD:src/calf/metadata.h
++=======
+ 
+ /// Filterclavier - metadata
+ struct filterclavier_metadata: public plugin_metadata<filterclavier_metadata>
+ {
+     enum { par_cutoff, par_transpose, par_detune, par_resonance, par_mode, par_inertia,  param_count };
+     enum { in_count = 2, out_count = 2, rt_capable = true, require_midi = false, support_midi = true };
+     PLUGIN_NAME_ID_LABEL("filterclavier", "filterclavier", "Filterclavier")
+     /// do not export mode and inertia as CVs, as those are settings and not parameters
+     bool is_cv(int param_no) { return param_no != par_mode && param_no != par_inertia; }
+ };
++>>>>>>> 76e4cd1c0814040a2e2c847ba3452b641d22e823:src/calf/metadata.h
      
  /// Thor's compressor - metadata
  struct compressor_metadata: public plugin_metadata<compressor_metadata>
diff --combined src/calf/modules_dev.h
index bc777b6,f9a0eea..68f4ba3
--- a/src/calf/modules_dev.h
+++ b/src/calf/modules_dev.h
@@@ -34,16 -34,12 +34,16 @@@ class filterclavier_audio_module
          public audio_module<filterclavier_metadata>, 
          public filter_module_with_inertia<biquad_filter_module, filterclavier_metadata>, 
          public line_graph_iface
 -    {
 +    {        
 +        const float min_resonance;
 +        const float max_resonance;
 +            
      public:    
 +        filterclavier_audio_module() : min_resonance(0.707), max_resonance(20.0) {}
          
          void params_changed()
          { 
 -            inertia_filter_module::params_changed(); 
 +            inertia_filter_module::calculate_filter(); 
          }
              
          void activate()
@@@ -64,18 -60,18 +64,22 @@@
        
          /// MIDI control
          virtual void note_on(int note, int vel)
++<<<<<<< HEAD:src/calf/modules_dev.h
 +        {            
++=======
+         {
++>>>>>>> 76e4cd1c0814040a2e2c847ba3452b641d22e823:src/calf/modules_dev.h
              inertia_filter_module::inertia_cutoff.set_inertia(
                      note_to_hz(note + *params[par_transpose], *params[par_detune]));
              inertia_filter_module::inertia_resonance.set_inertia( 
 -                    (float(vel) / 127.0) * (param_props[par_resonance].max - param_props[par_resonance].min)
 -                    + param_props[par_resonance].min);
 +                    (float(vel) / 127.0) * (max_resonance - min_resonance)
 +                    + min_resonance);
              inertia_filter_module::calculate_filter();
          }
          
          virtual void note_off(int note, int vel)
          {
 -            inertia_filter_module::inertia_resonance.set_inertia(param_props[par_resonance].min);
 +            inertia_filter_module::inertia_resonance.set_inertia(min_resonance);
              inertia_filter_module::calculate_filter();
          }        
          

-- 
calf audio plugins packaging