1 files changed, 41 insertions, 55 deletions

diff --git a/src/lp4pole.c b/src/lp4pole.c
index 8a7184e..a00ca5b 100644
--- a/src/lp4pole.c
+++ b/src/lp4pole.c
@@ -18,11 +18,9 @@
 */
 
 #include <stdlib.h>
-#include "lv2/lv2plug.in/ns/ext/morph/morph.h"
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 #include "lp4pole_filter.h"
 #include "common.h"
-#include "uris.h"
 
 #define LP4POLE_CUTOFF    0
 #define LP4POLE_RESONANCE 1
@@ -35,9 +33,6 @@ typedef struct {
 	float*         input;
 	float*         output;
 	LP4PoleFilter* lpf;
-	uint32_t       cutoff_is_cv;
-	uint32_t       resonance_is_cv;
-	URIs           uris;
 } Lp4pole;
 
 static void
@@ -73,33 +68,6 @@ connect_port(LV2_Handle instance,
 	}
 }
 
-static LV2_Morph_Status
-morph_port(LV2_Handle                      instance,
-           uint32_t                        port,
-           LV2_URID                        type,
-           const LV2_Morph_Property*const* properties)
-{
-	Lp4pole* plugin = (Lp4pole*)instance;
-
-	if (type != plugin->uris.lv2_ControlPort &&
-	    type != plugin->uris.lv2_CVPort) {
-		return LV2_MORPH_ERR_BAD_TYPE;
-	}
-
-	switch (port) {
-	case LP4POLE_CUTOFF:
-		plugin->cutoff_is_cv = (type == plugin->uris.lv2_CVPort);
-		break;
-	case LP4POLE_RESONANCE:
-		plugin->resonance_is_cv = (type == plugin->uris.lv2_CVPort);
-		break;
-	default:
-		return LV2_MORPH_ERR_BAD_PORT;
-	}
-
-	return LV2_MORPH_SUCCESS;
-}
-
 static LV2_Handle
 instantiate(const LV2_Descriptor*     descriptor,
             double                    sample_rate,
@@ -115,10 +83,6 @@ instantiate(const LV2_Descriptor*     descriptor,
 			plugin = 0;
 		}
 	}
-
-	plugin->cutoff_is_cv    = 0;
-	plugin->resonance_is_cv = 0;
-
 	return (LV2_Handle)plugin;
 }
 
@@ -131,15 +95,15 @@ activate(LV2_Handle instance)
 }
 
 static void
-run(LV2_Handle instance,
-    uint32_t   sample_count)
+runLp4pole_faraia_oa(LV2_Handle instance,
+                     uint32_t   sample_count)
 {
 	Lp4pole* plugin = (Lp4pole*)instance;
 
-	/* Cutoff Frequency (array of floats of length 1 or sample_count) */
+	/* Cutoff Frequency (array of floats of length sample_count) */
 	const float* cutoff = plugin->cutoff;
 
-	/* Resonance (array of floats of length 1 or sample_count) */
+	/* Resonance (array of floats of length sample_count) */
 	const float* resonance = plugin->resonance;
 
 	/* Input (array of floats of length sample_count) */
@@ -151,39 +115,61 @@ run(LV2_Handle instance,
 	/* Instance data */
 	LP4PoleFilter* lpf = plugin->lpf;
 
+	float in;
+	float co;
+	float res;
+
 	for (uint32_t s = 0; s < sample_count; ++s) {
-		const float co  = cutoff[s * plugin->cutoff_is_cv];
-		const float res = resonance[s * plugin->resonance_is_cv];
-		const float in  = input[s];
+		co  = cutoff[s];
+		res = resonance[s];
+		in  = input[s];
 
-		/* TODO: There is no branching in this function.
-		   Would it actually be faster to check if co or res has changed?
-		*/
 		lp4pole_set_params(lpf, co, res);
 
 		output[s] = lp4pole_run(lpf, in);
 	}
 }
 
-static const void*
-extension_data(const char* uri)
+static void
+runLp4pole_fcrcia_oa(LV2_Handle instance,
+                     uint32_t   sample_count)
 {
-	static const LV2_Morph_Interface morph = { morph_port, NULL };
-	if (!strcmp(uri, LV2_MORPH__interface)) {
-		return &morph;
+	Lp4pole* plugin = (Lp4pole*)instance;
+
+	/* Cutoff Frequency (float value) */
+	const float cutoff = *(plugin->cutoff);
+
+	/* Resonance (float value) */
+	const float resonance = *(plugin->resonance);
+
+	/* Input (array of floats of length sample_count) */
+	const float* input = plugin->input;
+
+	/* Output (pointer to float value) */
+	float* output = plugin->output;
+
+	/* Instance data */
+	LP4PoleFilter* lpf = plugin->lpf;
+
+	float in;
+
+	lp4pole_set_params(lpf, cutoff, resonance);
+
+	for (uint32_t s = 0; s < sample_count; ++s) {
+		in        = input[s];
+		output[s] = lp4pole_run(lpf, in);
 	}
-	return NULL;
 }
 
 static const LV2_Descriptor descriptor = {
-	"http://drobilla.net/plugins/blop/lp4pole",
+	"http://drobilla.net/plugins/blip/lp4pole",
 	instantiate,
 	connect_port,
 	activate,
-	run,
+	runLp4pole_fcrcia_oa,
 	NULL,
 	cleanup,
-	extension_data,
+	NULL,
 };
 
 LV2_SYMBOL_EXPORT const LV2_Descriptor*