[SCM] calf/master: + Filter, Filterclavier: add 6/12/18 dB/oct bandreject filter

js at users.alioth.debian.org js at users.alioth.debian.org
Tue May 7 15:39:04 UTC 2013


The following commit has been merged in the master branch:
commit 0e5c18aab120b1d2badbc41973fc125338042525
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Fri Jan 23 21:26:19 2009 +0000

    + Filter, Filterclavier: add 6/12/18 dB/oct bandreject filter

diff --git a/src/calf/audio_fx.h b/src/calf/audio_fx.h
index 4a2b03d..84023f8 100644
--- a/src/calf/audio_fx.h
+++ b/src/calf/audio_fx.h
@@ -619,7 +619,8 @@ public:
     enum { mode_12db_lp = 0, mode_24db_lp = 1, mode_36db_lp = 2, 
            mode_12db_hp = 3, mode_24db_hp = 4, mode_36db_hp = 5,
            mode_6db_bp  = 6, mode_12db_bp = 7, mode_18db_bp = 8,
-           mode_count = 9
+           mode_6db_br  = 9, mode_12db_br = 10, mode_18db_br = 11,
+           mode_count
     };
     
 public:
@@ -631,11 +632,14 @@ public:
             order = mode + 1;
             left[0].set_lp_rbj(freq, pow(q, 1.0 / order), srate, gain);
         } else if ( mode_12db_hp <= mode && mode <= mode_36db_hp ) {
-            order = mode - 2;
+            order = mode - mode_12db_hp + 1;
             left[0].set_hp_rbj(freq, pow(q, 1.0 / order), srate, gain);
-        } else { // mode_12db_bp <= mode <= mode_36db_bp
-            order = mode - 5;
+        } else if ( mode_6db_bp <= mode && mode <= mode_18db_bp ) {
+            order = mode - mode_6db_bp + 1;
             left[0].set_bp_rbj(freq, pow(q, 1.0 / order), srate, gain);
+        } else { // mode_6db_br <= mode <= mode_18db_br
+            order = mode - mode_6db_br + 1;
+            left[0].set_br_rbj(freq, pow(q, 1.0 / order), srate, gain);
         }
         
         right[0].copy_coeffs(left[0]);
diff --git a/src/modules.cpp b/src/modules.cpp
index 4cc177f..8485a30 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -102,6 +102,9 @@ const char *filter_choices[] = {
     "6dB/oct Bandpass",
     "12dB/oct Bandpass",
     "18dB/oct Bandpass",
+    "6dB/oct Bandreject",
+    "12dB/oct Bandreject",
+    "18dB/oct Bandreject",
 };
 
 CALF_PORT_PROPS(filter) = {

-- 
calf audio plugins packaging



More information about the pkg-multimedia-commits mailing list