[SCM] calf/master: + Filterclavier: Fix pending conflicts / double knob in GUI

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6ef3589bc85fefedb68994c21ca5654053aa526c
Author: Hans Baier <hansfbaier at googlemail.com>
Date:   Thu Jan 22 12:04:10 2009 +0700

     + Filterclavier: Fix pending conflicts / double knob in GUI

diff --git a/gui/gui-filterclavier.xml b/gui/gui-filterclavier.xml
index b1aad30..b3f0fef 100644
--- a/gui/gui-filterclavier.xml
+++ b/gui/gui-filterclavier.xml
@@ -11,11 +11,6 @@
             <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" />
diff --git a/src/calf/metadata.h b/src/calf/metadata.h
index d45cd41..bfc95bc 100644
--- a/src/calf/metadata.h
+++ b/src/calf/metadata.h
@@ -102,19 +102,6 @@ struct monosynth_metadata: public plugin_metadata<monosynth_metadata>
     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 --git a/src/calf/modules_dev.h b/src/calf/modules_dev.h
index 68f4ba3..578f674 100644
--- a/src/calf/modules_dev.h
+++ b/src/calf/modules_dev.h
@@ -64,11 +64,7 @@ class filterclavier_audio_module:
       
         /// 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( 

-- 
calf audio plugins packaging