Made dependent on KissFFT, made Soundpipe included

Author: aure

Package.resolved

@@ -16,18 +16,33 @@ let package = Package(
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        .package(url: "https://github.com/AudioKit/Soundpipe", .branch("main")),
+        .package(url: "https://github.com/AudioKit/KissFFT", .branch("main")),
         .package(url: "https://github.com/AudioKit/AudioKit", .branch("develop")),
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
+        .target(name: "Soundpipe",
+                dependencies: ["KissFFT"],
+                exclude: [
+                    "lib/kissfft/COPYING",
+                    "lib/kissfft/README",
+                    "lib/inih/LICENSE.txt",
+                ],
+                publicHeadersPath: "include",
+                cSettings: [
+                    .headerSearchPath("lib/kissfft"),
+                    .headerSearchPath("lib/inih"),
+                    .headerSearchPath("Sources/soundpipe/lib/inih"),
+                    .headerSearchPath("modules"),
+                    .headerSearchPath("external")
+                ]),
         .target(
             name: "SoundpipeAudioKit",
             dependencies: ["AudioKit", "CSoundpipeAudioKit"]),
         .target(
             name: "CSoundpipeAudioKit",
-            dependencies: ["AudioKit", "Soundpipe"]),
+            dependencies: ["AudioKit",  "Soundpipe"]),
         .testTarget(
             name: "SoundpipeAudioKitTests",
             dependencies: ["SoundpipeAudioKit"],

Package.swift

@@ -0,0 +1,86 @@
+#include <stdlib.h>
+#include "Soundpipe.h"
+#include "growl.h"
+
+static const SPFLOAT formants[] = {
+/* ae: top right  */
+844.0, 1656.0, 2437.0, 3704.0,
+/* a: top left */
+768.0, 1333.0, 2522.0, 3687.0,
+/* i: bottom left */
+324.0, 2985.0, 3329.0, 3807.0,
+/* u: bottom right */
+378.0, 997.0, 2343.0, 3357.0,
+};
+
+void growl_create(growl_d **form)
+{
+    int i;
+    *form = malloc(sizeof(growl_d));
+    growl_d *fp = *form;
+    for(i = 0; i < 4; i++) {
+        sp_reson_create(&fp->filt[i]);
+    }
+
+    sp_bal_create(&fp->bal);
+    sp_dcblock_create(&fp->dcblk);
+}
+
+void growl_init(sp_data *sp, growl_d *form)
+{
+    int i;
+    for(i = 0; i < 4; i++) {
+        sp_reson_init(sp, form->filt[i]);
+        form->filt[i]->freq = formants[i];
+        form->filt[i]->bw =
+            (formants[i] * 0.02) + 50;
+    }
+    sp_bal_init(sp, form->bal);
+    sp_dcblock_init(sp, form->dcblk);
+    form->x = 0;
+    form->y = 0;
+}
+
+void growl_compute(sp_data *sp, growl_d *form, SPFLOAT *in, SPFLOAT *out)
+{
+    int i;
+    SPFLOAT tmp_in = *in;
+    SPFLOAT tmp_out = *in;
+    SPFLOAT tf = 0.0;
+    SPFLOAT bf = 0.0;
+    SPFLOAT freq = 0.0;
+    SPFLOAT *x = &form->x;
+    SPFLOAT *y = &form->y;
+//    *out = 0.0;
+//
+    for(i = 0; i < 4; i++) {
+        tf = (*x) *
+            (formants[i + 3] - formants[i]) +
+            formants[i];
+        bf = (*x) *
+            (formants[i + 11] - formants[i + 7]) +
+            formants[i + 7];
+        freq = (*y) * (bf - tf) + tf;
+        form->filt[i]->freq = freq;
+        form->filt[i]->bw =
+            ((freq * 0.02) + 50);
+        sp_reson_compute(sp, form->filt[i], &tmp_in, &tmp_out);
+        tmp_in = tmp_out;
+    }
+    *out = *in;
+    sp_bal_compute(sp, form->bal, &tmp_out, in, out);
+    tmp_out = *out;
+    sp_dcblock_compute(sp, form->dcblk, &tmp_out, out);
+}
+
+void growl_destroy(growl_d **form)
+{
+    int i;
+    growl_d *fd = *form;
+    for(i = 0; i < 4; i++) {
+        sp_reson_destroy(&fd->filt[i]);
+    }
+    sp_bal_destroy(&fd->bal);
+    sp_dcblock_destroy(&fd->dcblk);
+    free(*form);
+}

Sources/Soundpipe/external/growl.c

@@ -0,0 +1,12 @@
+typedef struct {
+    SPFLOAT x;
+    SPFLOAT y;
+    sp_reson *filt[4];
+    sp_bal *bal;
+    sp_dcblock *dcblk;
+} growl_d;
+
+void growl_create(growl_d **form);
+void growl_init(sp_data *sp, growl_d *form);
+void growl_compute(sp_data *sp, growl_d *form, SPFLOAT *in, SPFLOAT *out);
+void growl_destroy(growl_d **form);

Sources/Soundpipe/external/growl.h

@@ -0,0 +1,48 @@
+#include <stdlib.h>
+#include "Soundpipe.h"
+#include "vocwrapper.h"
+
+int sp_vocwrapper_create(sp_vocwrapper **p)
+{
+    sp_vocwrapper *pp;
+    *p = malloc(sizeof(sp_vocwrapper));
+    pp = *p;
+    sp_voc_create(&pp->voc);
+    return SP_OK;
+}
+
+int sp_vocwrapper_destroy(sp_vocwrapper **p)
+{
+    sp_vocwrapper *pp = *p;
+    sp_voc_destroy(&pp->voc);
+    free(*p);
+    return SP_OK;
+}
+
+int sp_vocwrapper_init(sp_data *sp, sp_vocwrapper *p)
+{
+    p->freq = 160;
+    p->pos = 0.5;
+    p->pos = 1;
+    p->nasal = 0.0;
+    p->tenseness = 0.6;
+    sp_voc_init(sp, p->voc);
+    return SP_OK;
+}
+
+int sp_vocwrapper_compute(sp_data *sp, sp_vocwrapper *p, SPFLOAT *in, SPFLOAT *out)
+{
+    sp_voc *voc;
+
+    voc = p->voc;
+
+    if(sp_voc_get_counter(voc) == 0) {
+        sp_voc_set_velum(voc, 0.01 + 0.8 * p->nasal);
+        sp_voc_set_tongue_shape(voc, 12 + 16.0*p->pos, p->diam*3.5);
+    }
+    sp_voc_set_frequency(voc, p->freq);
+    sp_voc_set_tenseness(voc, p->tenseness);
+
+    sp_voc_compute(sp, voc, out);
+    return SP_OK;
+}