Umm... commit pretty much all the work of the past few days. Again.

git-svn-id: http://svn.drobilla.net/lad/trunk/plugins/blop.lv2@4488 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 46 insertions, 31 deletions

diff --git a/src/amp.c b/src/amp.c
index edb9291..dac6bb0 100644
--- a/src/amp.c
+++ b/src/amp.c
@@ -18,8 +18,10 @@
 */
 
 #include <stdlib.h>
+#include "lv2/lv2plug.in/ns/ext/morph/morph.h"
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
 #include "math_func.h"
+#include "uris.h"
 
 #define AMP_GAIN   0
 #define AMP_INPUT  1
@@ -29,6 +31,8 @@ typedef struct {
 	const float* gain;
 	const float* input;
 	float*       output;
+	URIs         uris;
+	uint32_t     gain_is_cv;
 } Amp;
 
 static void
@@ -57,6 +61,28 @@ 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)
+{
+	Amp* plugin = (Amp*)instance;
+	switch (port) {
+	case AMP_GAIN:
+		if (type == plugin->uris.lv2_ControlPort) {
+			plugin->gain_is_cv = 0;
+		} else if (type == plugin->uris.lv2_CVPort) {
+			plugin->gain_is_cv = 1;
+		} else {
+			return LV2_MORPH_ERR_BAD_TYPE;
+		}
+		return LV2_MORPH_SUCCESS;
+	default:
+		return LV2_MORPH_ERR_BAD_PORT;
+	}
+}
+
 static LV2_Handle
 instantiate(const LV2_Descriptor*     descriptor,
             double                    sample_rate,
@@ -64,13 +90,19 @@ instantiate(const LV2_Descriptor*     descriptor,
             const LV2_Feature* const* features)
 {
 	Amp* plugin = (Amp*)malloc(sizeof(Amp));
+	if (!plugin) {
+		return NULL;
+	}
+
+	plugin->gain_is_cv = 0;
+	map_uris(&plugin->uris, features);
 
 	return (LV2_Handle)plugin;
 }
 
 static void
-runAmp_gaia_oa(LV2_Handle instance,
-               uint32_t   sample_count)
+run(LV2_Handle instance,
+    uint32_t   sample_count)
 {
 	Amp* plugin = (Amp*)instance;
 
@@ -83,50 +115,33 @@ runAmp_gaia_oa(LV2_Handle instance,
 	/* Output */
 	float* output = plugin->output;
 
-	float gn;
-	float in;
-	float scale;
-
 	for (uint32_t s = 0; s < sample_count; ++s) {
-		gn = gain[s];
-		in = input[s];
+		const float gn    = gain[s * plugin->gain_is_cv];
+		const float scale = (float)EXPF(M_LN10 * gn * 0.05f);
 
-		scale = (float)EXPF(M_LN10 * gn * 0.05f);
-
-		output[s] = scale * in;
+		output[s] = scale * input[s];
 	}
 }
 
-static void
-runAmp_gcia_oa(LV2_Handle instance,
-               uint32_t   sample_count)
+static const void*
+extension_data(const char* uri)
 {
-	Amp* plugin = (Amp*)instance;
-
-	/* Gain (dB) */
-	const float gain = *(plugin->gain);
-
-	/* Input */
-	const float* input = plugin->input;
-
-	/* Output */
-	float* output = plugin->output;
-
-	const float scale = (float)EXPF(M_LN10 * gain * 0.05f);
-	for (uint32_t s = 0; s < sample_count; s++) {
-		output[s] = scale * input[s];
+	static const LV2_Morph_Interface morph = { morph_port, NULL };
+	if (!strcmp(uri, LV2_MORPH__interface)) {
+		return &morph;
 	}
+	return NULL;
 }
 
 static const LV2_Descriptor descriptor = {
-	"http://drobilla.net/plugins/blip/amp",
+	"http://drobilla.net/plugins/blop/amp",
 	instantiate,
 	connect_port,
 	NULL,
-	runAmp_gcia_oa,
+	run,
 	NULL,
 	cleanup,
-	NULL,
+	extension_data,
 };
 
 LV2_SYMBOL_EXPORT const LV2_Descriptor*