fix bwpp_comb + fxpp_comb

examples/fxpp_comb/daisy-seed/Makefile

@@ -0,0 +1,7 @@
+ROOT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
+
+TARGET = bw_example_fxpp_comb
+
+CPP_SOURCES_EXTRA = ${ROOT_DIR}/../src/bw_example_fxpp_comb.cpp
+
+include ${ROOT_DIR}/../../common/daisy-seed/daisy-seed.mk

examples/fxpp_comb/daisy-seed/config_daisy_seed.h

@@ -0,0 +1,39 @@
+/*
+ * Brickworks
+ *
+ * Copyright (C) 2023 Orastron Srl unipersonale
+ *
+ * Brickworks is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * Brickworks is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Brickworks.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * File authors: Stefano D'Angelo
+ */
+
+#ifndef _CONFIG_DAISY_SEED_H
+#define _CONFIG_DAISY_SEED_H
+
+struct config_pin {
+	int	param_index;
+	int	pin;
+};
+
+#define NUM_PINS 	5
+
+static struct config_pin config_pins[NUM_PINS] = {
+	{ 0, 15 },
+	{ 1, 16 },
+	{ 2, 17 },
+	{ 3, 18 },
+	{ 4, 19 }
+};
+
+#endif

examples/fxpp_comb/src/bw_example_fxpp_comb.cpp

@@ -0,0 +1,62 @@
+/*
+ * Brickworks
+ *
+ * Copyright (C) 2023 Orastron Srl unipersonale
+ *
+ * Brickworks is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * Brickworks is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Brickworks.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * File author: Stefano D'Angelo
+ */
+
+#include "bw_example_fxpp_comb.h"
+
+void bw_example_fxpp_comb_init(bw_example_fxpp_comb *instance) {
+	(void)instance;
+}
+
+void bw_example_fxpp_comb_set_sample_rate(bw_example_fxpp_comb *instance, float sample_rate) {
+	instance->comb.setSampleRate(sample_rate);
+}
+
+void bw_example_fxpp_comb_reset(bw_example_fxpp_comb *instance) {
+	instance->comb.reset();
+}
+
+void bw_example_fxpp_comb_process(bw_example_fxpp_comb *instance, const float** x, float** y, int n_samples) {
+	instance->comb.process({x[0]}, {y[0]}, n_samples);
+}
+
+void bw_example_fxpp_comb_set_parameter(bw_example_fxpp_comb *instance, int index, float value) {
+	instance->params[index] = value;
+	switch (index) {
+	case p_ff_delay:
+		instance->comb.setDelayFF(value);
+		break;
+	case p_fb_delay:
+		instance->comb.setDelayFB(value);
+		break;
+	case p_blend:
+		instance->comb.setCoeffBlend(value);
+		break;
+	case p_ff:
+		instance->comb.setCoeffFF(value + value - 1.f);
+		break;
+	case p_fb:
+		instance->comb.setCoeffFB(1.99f * value - 0.995f);
+		break;
+	}
+}
+
+float bw_example_fxpp_comb_get_parameter(bw_example_fxpp_comb *instance, int index) {
+	return instance->params[index];
+}

examples/fxpp_comb/src/bw_example_fxpp_comb.h

@@ -0,0 +1,57 @@
+/*
+ * Brickworks
+ *
+ * Copyright (C) 2023 Orastron Srl unipersonale
+ *
+ * Brickworks is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * Brickworks is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Brickworks.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * File author: Stefano D'Angelo
+ */
+
+#ifndef _BW_EXAMPLE_FXPP_COMB_H
+#define _BW_EXAMPLE_FXPP_COMB_H
+
+#include <bwpp_comb.h>
+
+using namespace Brickworks;
+
+extern "C" {
+
+enum {
+	p_ff_delay,
+	p_fb_delay,
+	p_blend,
+	p_ff,
+	p_fb,
+	p_n
+};
+
+struct _bw_example_fxpp_comb {
+	// Sub-components
+	Comb<1>	comb;
+
+	// Parameters
+	float	params[p_n];
+};
+typedef struct _bw_example_fxpp_comb bw_example_fxpp_comb;
+
+void bw_example_fxpp_comb_init(bw_example_fxpp_comb *instance);
+void bw_example_fxpp_comb_set_sample_rate(bw_example_fxpp_comb *instance, float sample_rate);
+void bw_example_fxpp_comb_reset(bw_example_fxpp_comb *instance);
+void bw_example_fxpp_comb_process(bw_example_fxpp_comb *instance, const float** x, float** y, int n_samples);
+void bw_example_fxpp_comb_set_parameter(bw_example_fxpp_comb *instance, int index, float value);
+float bw_example_fxpp_comb_get_parameter(bw_example_fxpp_comb *instance, int index);
+
+}
+
+#endif

examples/fxpp_comb/src/config.h

@@ -0,0 +1,91 @@
+/*
+ * Brickworks
+ *
+ * Copyright (C) 2023 Orastron Srl unipersonale
+ *
+ * Brickworks is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * Brickworks is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Brickworks.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * File authors: Stefano D'Angelo
+ */
+
+#ifndef _CONFIG_H
+#define _CONFIG_H
+
+// Definitions
+
+#define IO_MONO			1
+#define IO_STEREO		(1<<1)
+
+struct config_io_bus {
+	const char	*name;
+	char		 out;
+	char		 aux;
+	char		 cv;
+	char		 configs;
+};
+
+struct config_parameter {
+	const char	*name;
+	const char	*shortName;
+	const char	*units;
+	char		 out;
+	char		 bypass;
+	int		 steps;
+	float		 defaultValueUnmapped;
+};
+
+// Data
+
+#define COMPANY_NAME		"Orastron"
+#define COMPANY_WEBSITE		"https://www.orastron.com/"
+#define COMPANY_MAILTO		"mailto:info@orastron.com"
+
+#define PLUGIN_NAME		"bw_example_fxpp_comb"
+#define PLUGIN_VERSION		"0.5.0"
+
+#define NUM_BUSES_IN		1
+#define NUM_BUSES_OUT		1
+#define NUM_CHANNELS_IN		1
+#define NUM_CHANNELS_OUT	1
+
+static struct config_io_bus config_buses_in[NUM_BUSES_IN] = {
+	{ "Audio in", 0, 0, 0, IO_MONO }
+};
+
+static struct config_io_bus config_buses_out[NUM_BUSES_OUT] = {
+	{ "Audio out", 1, 0, 0, IO_MONO }
+};
+
+#define NUM_PARAMETERS		5
+
+static struct config_parameter config_parameters[NUM_PARAMETERS] = {
+	{ "Feedforward delay", "FF delay", "", 0, 0, 0, 0.f },
+	{ "Feedback delay", "FB delay", "", 0, 0, 0, 0.f },
+	{ "Blend", "Blend", "", 0, 0, 0, 1.f },
+	{ "Feedforward", "FF", "", 0, 0, 0, 0.5f },
+	{ "Feedback", "FB", "", 0, 0, 0, 0.5f }
+};
+
+// Internal API
+
+#include "bw_example_fxpp_comb.h"
+
+#define P_TYPE				bw_example_fxpp_comb
+#define P_INIT				bw_example_fxpp_comb_init
+#define P_SET_SAMPLE_RATE		bw_example_fxpp_comb_set_sample_rate
+#define P_RESET				bw_example_fxpp_comb_reset
+#define P_PROCESS			bw_example_fxpp_comb_process
+#define P_SET_PARAMETER			bw_example_fxpp_comb_set_parameter
+#define P_GET_PARAMETER			bw_example_fxpp_comb_get_parameter
+
+#endif

examples/fxpp_comb/vst3/Makefile

@@ -0,0 +1,6 @@
+ROOT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
+
+NAME := bw_example_fxpp_comb
+SOURCES = ${SOURCES_COMMON} ${ROOT_DIR}/../src/bw_example_fxpp_comb.cpp
+
+include ${ROOT_DIR}/../../common/vst3/vst3.mk

examples/fxpp_comb/vst3/config_vst3.h

@@ -0,0 +1,36 @@
+/*
+ * Brickworks
+ *
+ * Copyright (C) 2023 Orastron Srl unipersonale
+ *
+ * Brickworks is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License.
+ *
+ * Brickworks is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Brickworks.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * File authors: Stefano D'Angelo, Paolo Marrone
+ */
+
+#ifndef _VST3_CONFIG_H
+#define _VST3_CONFIG_H
+
+#define PLUGIN_SUBCATEGORY	"Fx|Delay"
+
+#define PLUGIN_GUID_1		0x7b0953c9
+#define PLUGIN_GUID_2		0xba334cb1
+#define PLUGIN_GUID_3		0x963394cf
+#define PLUGIN_GUID_4		0x700098b9
+
+#define CTRL_GUID_1		0x089396db
+#define CTRL_GUID_2		0x58854e74
+#define CTRL_GUID_3		0x8a70c9de
+#define CTRL_GUID_4		0x97e810dd
+
+#endif

include/bwpp_comb.h

@@ -102,11 +102,6 @@ namespace Brickworks {
 		bw_comb_set_delay_fb(&coeffs, value);
 	}
 	
-	template<BW_SIZE_T N_CHANNELS>
-	inline void Comb<N_CHANNELS>::setDelayFB(float value) {
-		bw_comb_set_delay_fb(&coeffs, value);
-	}
-	
 	template<BW_SIZE_T N_CHANNELS>
 	inline void Comb<N_CHANNELS>::setCoeffBlend(float value) {
 		bw_comb_set_coeff_blend(&coeffs, value);