Blip => Blop. I give up trying to give ports new names.

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

1 files changed, 141 insertions, 64 deletions

diff --git a/src/pulse.c b/src/pulse.c
index 51b1147..8890fbd 100644
--- a/src/pulse.c
+++ b/src/pulse.c
@@ -18,9 +18,7 @@
 */
 
 #include <stdlib.h>
-#include "lv2/lv2plug.in/ns/ext/morph/morph.h"
 #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-#include "uris.h"
 #include "wavedata.h"
 
 #define PULSE_FREQUENCY  0
@@ -32,10 +30,7 @@ typedef struct {
 	float*   pulsewidth;
 	float*   output;
 	float    phase;
-	uint32_t frequency_is_cv;
-	uint32_t pulsewidth_is_cv;
 	Wavedata wdat;
-	URIs     uris;
 } Pulse;
 
 static void
@@ -58,33 +53,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)
-{
-	Pulse* plugin = (Pulse*)instance;
-
-	if (type != plugin->uris.lv2_ControlPort &&
-	    type != plugin->uris.lv2_CVPort) {
-		return LV2_MORPH_ERR_BAD_TYPE;
-	}
-
-	switch (port) {
-	case PULSE_FREQUENCY:
-		plugin->frequency_is_cv = (type == plugin->uris.lv2_CVPort);
-		break;
-	case PULSE_PULSEWIDTH:
-		plugin->pulsewidth_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,
@@ -99,11 +67,6 @@ instantiate(const LV2_Descriptor*     descriptor,
 		return 0;
 	}
 
-	plugin->frequency_is_cv = 0;
-	plugin->pulsewidth_is_cv = 0;
-	map_uris(&plugin->uris, features);
-	wavedata_get_table(&plugin->wdat, 440.0);
-
 	return (LV2_Handle)plugin;
 }
 
@@ -125,8 +88,8 @@ activate(LV2_Handle instance)
 }
 
 static void
-run(LV2_Handle instance,
-    uint32_t   sample_count)
+runPulse_fapa_oa(LV2_Handle instance,
+                 uint32_t   sample_count)
 {
 	Pulse* plugin = (Pulse*)instance;
 
@@ -143,32 +106,114 @@ run(LV2_Handle instance,
 	Wavedata* wdat  = &plugin->wdat;
 	float     phase = plugin->phase;
 
-	float last_pwidth = pulsewidth[0];
-	float pwidth      = f_clip(last_pwidth, 0.0f, 1.0f);
-	float dc_shift    = 1.0 - (2.0 * pwidth);
-	float phase_shift = pwidth * wdat->sample_rate;
+	float freq;
+	float pwidth;
+	float phase_shift;
 
 	for (uint32_t s = 0; s < sample_count; ++s) {
-		const float freq = frequency[s * plugin->frequency_is_cv];
-		if (freq != wdat->frequency) {
-			/* Frequency changed, look up table to play */
-			wavedata_get_table(wdat, freq);
+		freq        = frequency[s];
+		pwidth      = f_clip(pulsewidth[s], 0.0f, 1.0f);
+		phase_shift = pwidth * wdat->sample_rate;
+
+		/* Lookup which table to use from frequency */
+		wavedata_get_table(wdat, freq);
+
+		/* Get samples from sawtooth and phase shifted inverted sawtooth,
+		   with approriate DC offset */
+		output[s] = wavedata_get_sample(wdat, phase)
+		    - wavedata_get_sample(wdat, phase + phase_shift)
+		    + 1.0f - (2.0f * pwidth);
+
+		/* Update phase, wrapping if necessary */
+		phase += wdat->frequency;
+		if (phase < 0.0f) {
+			phase += wdat->sample_rate;
+		} else if (phase > wdat->sample_rate) {
+			phase -= wdat->sample_rate;
 		}
+	}
+	plugin->phase = phase;
+}
+
+static void
+runPulse_fapc_oa(LV2_Handle instance,
+                 uint32_t   sample_count)
+{
+	Pulse* plugin = (Pulse*)instance;
+
+	/* Frequency (array of float of length sample_count) */
+	const float* frequency = plugin->frequency;
+
+	/* Pulse Width (float value) */
+	const float pulsewidth = f_clip(*(plugin->pulsewidth), 0.0f, 1.0f);
+
+	/* Output (pointer to float value) */
+	float* output = plugin->output;
 
-		const float this_pwidth = pulsewidth[s * plugin->pulsewidth_is_cv];
-		if (this_pwidth != last_pwidth) {
-			/* Pulsewidth changed, recalculate */
-			last_pwidth = this_pwidth;
-			pwidth      = f_clip(this_pwidth, 0.0f, 1.0f);
-			dc_shift    = 1.0f - (2.0f * pwidth);
-			phase_shift = pwidth * wdat->sample_rate;
+	/* Instance data */
+	Wavedata* wdat  = &plugin->wdat;
+	float     phase = plugin->phase;
+
+	float freq;
+	float dc_shift    = 1.0 - (2.0 * pulsewidth);
+	float phase_shift = pulsewidth * wdat->sample_rate;
+
+	for (uint32_t s = 0; s < sample_count; ++s) {
+		freq = frequency[s];
+
+		/* Lookup which table to use from frequency */
+		wavedata_get_table(wdat, freq);
+
+		/* Get samples from sawtooth and phase shifted inverted sawtooth,
+		   with approriate DC offset */
+		output[s] = wavedata_get_sample(wdat, phase)
+		    - wavedata_get_sample(wdat, phase + phase_shift)
+		    + dc_shift;
+
+		/* Update phase, wrapping if necessary */
+		phase += wdat->frequency;
+		if (phase < 0.0f) {
+			phase += wdat->sample_rate;
+		} else if (phase > wdat->sample_rate) {
+			phase -= wdat->sample_rate;
 		}
+	}
+	plugin->phase = phase;
+}
+
+static void
+runPulse_fcpa_oa(LV2_Handle instance,
+                 uint32_t   sample_count)
+{
+	Pulse* plugin = (Pulse*)instance;
+
+	/* Frequency (float value) */
+	const float frequency = *(plugin->frequency);
+
+	/* Pulse Width (array of float of length sample_count) */
+	const float* pulsewidth = plugin->pulsewidth;
+
+	/* Output (pointer to float value) */
+	float* output = plugin->output;
+
+	/* Instance data */
+	Wavedata* wdat  = &plugin->wdat;
+	float     phase = plugin->phase;
+
+	float pwidth;
+	float phase_shift;
+
+	wavedata_get_table(wdat, frequency);
+
+	for (uint32_t s = 0; s < sample_count; ++s) {
+		pwidth      = f_clip(pulsewidth[s], 0.0f, 1.0f);
+		phase_shift = pwidth * wdat->sample_rate;
 
 		/* Get samples from sawtooth and phase shifted inverted sawtooth,
 		   with approriate DC offset */
 		output[s] = wavedata_get_sample(wdat, phase)
 		    - wavedata_get_sample(wdat, phase + phase_shift)
-			+ dc_shift;
+		    + 1.0f - (2.0f * pwidth);
 
 		/* Update phase, wrapping if necessary */
 		phase += wdat->frequency;
@@ -181,25 +226,57 @@ run(LV2_Handle instance,
 	plugin->phase = phase;
 }
 
-static const void*
-extension_data(const char* uri)
+static void
+runPulse_fcpc_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;
+	Pulse* plugin = (Pulse*)instance;
+
+	/* Frequency (float value) */
+	const float frequency = *(plugin->frequency);
+
+	/* Pulse Width (float value) */
+	const float pulsewidth = f_clip(*(plugin->pulsewidth), 0.0f, 1.0f);
+
+	/* Output (pointer to float value) */
+	float* output = plugin->output;
+
+	/* Instance data */
+	Wavedata* wdat  = &plugin->wdat;
+	float     phase = plugin->phase;
+
+	float dc_shift    = 1.0f - (2.0f * pulsewidth);
+	float phase_shift = pulsewidth * wdat->sample_rate;
+
+	wavedata_get_table(wdat, frequency);
+
+	for (uint32_t s = 0; s < sample_count; ++s) {
+		/* Get samples from sawtooth and phase shifted inverted sawtooth,
+		   with approriate DC offset */
+		output[s] = wavedata_get_sample(wdat, phase)
+		    - wavedata_get_sample(wdat, phase + phase_shift)
+		    + dc_shift;
+
+		/* Update phase, wrapping if necessary */
+		phase += wdat->frequency;
+		if (phase < 0.0f) {
+			phase += wdat->sample_rate;
+		} else if (phase > wdat->sample_rate) {
+			phase -= wdat->sample_rate;
+		}
 	}
-	return NULL;
+	plugin->phase = phase;
 }
 
 static const LV2_Descriptor descriptor = {
-	"http://drobilla.net/plugins/blop/pulse",
+	"http://drobilla.net/plugins/blip/pulse",
 	instantiate,
 	connect_port,
 	activate,
-	run,
+	runPulse_fcpc_oa,
 	NULL,
 	cleanup,
-	extension_data,
+	NULL,
 };
 
 LV2_SYMBOL_EXPORT const LV2_Descriptor*