Changeset 19123e6624236b0f9c97a3e13df1a493436350c2

Timestamp:

06/10/09 02:47:39 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

430899e583d1ce72d6fb3fbf929006c61f7fdc23

Parents:

e7c6b41ac5a2552147e83c248b26252f2841a35e

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2009-06-10T02:47:39Z+0300

Message:

Apply updates in FIL-plugins between 0.1.0 and 0.3.0

The new filter will 'feel' different in particular
the interaction between gain and bandwidth. This
version is much closer to what you'll find in the
best analog (and digital) mixers. But it's still
the same filter, only the mapping of parameter
values to responses has changed.

Files:

• filter.c (modified) (6 diffs)

filter.c

@@ -52 +52 @@
   struct param_sect * sect_ptr)
 {
-  sect_ptr->f = 0.25;
-  sect_ptr->b = sect_ptr->g = 1.0;
-  sect_ptr->a = sect_ptr->s1 = sect_ptr->s2 = sect_ptr->z1 = sect_ptr->z2 = 0.0;
+  sect_ptr->f = 0.25f;
+  sect_ptr->b = sect_ptr->g = 1.0f;
+  sect_ptr->a = sect_ptr->s1 = sect_ptr->s2 = sect_ptr->z1 = sect_ptr->z2 = 0.0f;
 }
 
@@ -79 +79 @@
   if (f != sect_ptr->f)
   {
-    if      (f < 0.5 * sect_ptr->f) f = 0.5 * sect_ptr->f;
-    else if (f > 2.0 * sect_ptr->f) f = 2.0 * sect_ptr->f;
+    if      (f < 0.5f * sect_ptr->f) f = 0.5f * sect_ptr->f;
+    else if (f > 2.0f * sect_ptr->f) f = 2.0f * sect_ptr->f;
     sect_ptr->f = f;
-    sect_ptr->s1 = -cos(2 * M_PI * f);
+    sect_ptr->s1 = -cosf(6.283185f * f);
     d1 = (sect_ptr->s1 - s1) / k;
     u2 = true;
@@ -89 +89 @@
   if (g != sect_ptr->g)
   {
-    if      (g < 0.5 * sect_ptr->g) g = 0.5 * sect_ptr->g;
-    else if (g > 2.0 * sect_ptr->g) g = 2.0 * sect_ptr->g;
+    if      (g < 0.5f * sect_ptr->g) g = 0.5f * sect_ptr->g;
+    else if (g > 2.0f * sect_ptr->g) g = 2.0f * sect_ptr->g;
     sect_ptr->g = g;
-    sect_ptr->a = 0.5 * (g - 1.0);
+    sect_ptr->a = 0.5f * (g - 1.0f);
     da = (sect_ptr->a - a) / k;
     u2 = true;
@@ -99 +99 @@
   if (b != sect_ptr->b)
   {
-    if      (b < 0.5 * sect_ptr->b) b = 0.5 * sect_ptr->b;
-    else if (b > 2.0 * sect_ptr->b) b = 2.0 * sect_ptr->b;
+    if      (b < 0.5f * sect_ptr->b) b = 0.5f * sect_ptr->b;
+    else if (b > 2.0f * sect_ptr->b) b = 2.0f * sect_ptr->b;
     sect_ptr->b = b;
     u2 = true;
@@ -107 +107 @@
   if (u2)
   {
-    b *= 4 * f;
-    sect_ptr->s2 = (1 + sect_ptr->a - b) / (1 + sect_ptr->a + b);
+    b *= 7 * f / sqrtf(g);         
+    sect_ptr->s2 = (1 - b) / (1 + b);
     d2 = (sect_ptr->s2 - s2) / k;
   }
@@ -122 +122 @@
     y -= s1 * sect_ptr->z1;
     sect_ptr->z2 = sect_ptr->z1 + s1 * y;
-    sect_ptr->z1 = y + 1e-10;
+    sect_ptr->z1 = y + 1e-10f;
   }
 }