[SCM] calf/master: + Wavetable: new wavetables + 2 presets

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit dd60a1c74f80e0147ae0f50e1959202fa6a0659b
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Mon Mar 2 22:21:45 2009 +0000

    + Wavetable: new wavetables + 2 presets

diff --git a/presets.xml b/presets.xml
index a7c2e23..bd9df49 100644
--- a/presets.xml
+++ b/presets.xml
@@ -3885,4 +3885,58 @@
   <param name="bass_cut" value="514.079" />
   <param name="treble_cut" value="4064.15" />
 </preset>
+<preset plugin="wavetable" name="AmbiDeXtrous">
+  <param name="o1wave" value="13" />
+  <param name="o1offset" value="-0.02" />
+  <param name="o1trans" value="0" />
+  <param name="o1detune" value="6" />
+  <param name="o1level" value="0.03125" />
+  <param name="o2wave" value="15" />
+  <param name="o2offset" value="0.02" />
+  <param name="o2trans" value="0" />
+  <param name="o2detune" value="-6" />
+  <param name="o2level" value="0.0412346" />
+  <param name="adsr_a" value="1" />
+  <param name="adsr_d" value="1274.22" />
+  <param name="adsr_s" value="0.39" />
+  <param name="adsr_r" value="50" />
+  <param name="adsr_v" value="0" />
+  <param name="adsr2_a" value="1" />
+  <param name="adsr2_d" value="60.93" />
+  <param name="adsr2_s" value="0" />
+  <param name="adsr2_r" value="50" />
+  <param name="adsr2_v" value="0" />
+  <param name="adsr3_a" value="1" />
+  <param name="adsr3_d" value="350" />
+  <param name="adsr3_s" value="0.5" />
+  <param name="adsr3_r" value="50" />
+  <param name="adsr3_v" value="0" />
+</preset>
+<preset plugin="wavetable" name="The Clav">
+  <param name="o1wave" value="8" />
+  <param name="o1offset" value="-0.64" />
+  <param name="o1trans" value="0" />
+  <param name="o1detune" value="6" />
+  <param name="o1level" value="0.1" />
+  <param name="o2wave" value="6" />
+  <param name="o2offset" value="-2.98023e-09" />
+  <param name="o2trans" value="0" />
+  <param name="o2detune" value="-6" />
+  <param name="o2level" value="0.0824692" />
+  <param name="adsr_a" value="1" />
+  <param name="adsr_d" value="350" />
+  <param name="adsr_s" value="0.5" />
+  <param name="adsr_r" value="50" />
+  <param name="adsr_v" value="0" />
+  <param name="adsr2_a" value="1" />
+  <param name="adsr2_d" value="350" />
+  <param name="adsr2_s" value="0.5" />
+  <param name="adsr2_r" value="50" />
+  <param name="adsr2_v" value="0" />
+  <param name="adsr3_a" value="1" />
+  <param name="adsr3_d" value="350" />
+  <param name="adsr3_s" value="0.5" />
+  <param name="adsr3_r" value="50" />
+  <param name="adsr3_v" value="0" />
+</preset>
 </presets>
diff --git a/src/calf/metadata.h b/src/calf/metadata.h
index 984cba8..35cc3ac 100644
--- a/src/calf/metadata.h
+++ b/src/calf/metadata.h
@@ -227,6 +227,10 @@ struct wavetable_metadata: public plugin_metadata<wavetable_metadata>
         wt_hardsync,
         wt_hardsync2,
         wt_softsync,
+        wt_bell2,
+        wt_bell3,
+        wt_tine,
+        wt_tine2,
         wt_count
     };
     enum { 
diff --git a/src/modules.cpp b/src/modules.cpp
index 2b96037..3d9bbc4 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -517,6 +517,10 @@ const char *wavetable_names[] = {
     "Hard Sync",
     "Hard Sync 2",
     "Soft Sync",
+    "Bell 2",
+    "Bell 3",
+    "Tine",
+    "Tine 2",
 };
 
 const char *wavetable_init_soundfont = "";
diff --git a/src/wavetable.cpp b/src/wavetable.cpp
index 40dda71..4486370 100644
--- a/src/wavetable.cpp
+++ b/src/wavetable.cpp
@@ -269,6 +269,46 @@ wavetable_audio_module::wavetable_audio_module()
             tables[wavetable_metadata::wt_softsync][i][j] = 32000 * v;
         }
     }
+    for (int i = 0; i < 129; i++)
+    {
+        for (int j = 0; j < 256; j++)
+        {
+            float ph = j * 2 * M_PI / 256;
+            float ii = i / 128.0;
+            float v = (sin(ph) + ii * sin(ph - 3 * ii * sin(ph)) + ii * ii * ii * sin(7 * ph - 2 * ii * ii * ii * ii * sin(13 * ph))) / 3;
+            tables[wavetable_metadata::wt_bell2][i][j] = 32767 * v;
+        }
+    }
+    for (int i = 0; i < 129; i++)
+    {
+        for (int j = 0; j < 256; j++)
+        {
+            float ph = j * 2 * M_PI / 256;
+            float ii = i / 128.0;
+            float v = (sin(ph) + ii * sin(ph - 3 * ii * sin(ph)) + ii * ii * ii * sin(9 * ph - ii * ii * sin(11 * ph))) / 3;
+            tables[wavetable_metadata::wt_bell3][i][j] = 32767 * v;
+        }
+    }
+    for (int i = 0; i < 129; i++)
+    {
+        for (int j = 0; j < 256; j++)
+        {
+            float ph = j * 2 * M_PI / 256;
+            float ii = i / 128.0;
+            float v = (sin(ph + ii * sin(ph - 3 * ii * sin(ph) + ii * ii * ii * sin(5 * ph - ii * ii * sin(7 * ph)))));
+            tables[wavetable_metadata::wt_tine][i][j] = 32767 * v;
+        }
+    }
+    for (int i = 0; i < 129; i++)
+    {
+        for (int j = 0; j < 256; j++)
+        {
+            float ph = j * 2 * M_PI / 256;
+            float ii = i / 128.0;
+            float v = (sin(ph + ii * sin(ph - 2 * ii * sin(ph) + ii * ii * ii * sin(3 * ph - ii * ii * sin(4 * ph)))));
+            tables[wavetable_metadata::wt_tine2][i][j] = 32767 * v;
+        }
+    }
 }
 
 

-- 
calf audio plugins packaging