diff --git a/plugins/modulay/DistrhoPluginInfo.h b/plugins/modulay/DistrhoPluginInfo.h index a90cf08..08136a8 100644 --- a/plugins/modulay/DistrhoPluginInfo.h +++ b/plugins/modulay/DistrhoPluginInfo.h @@ -1,6 +1,5 @@ /* - * DPF Max Gen - * Copyright (C) 2015 Filipe Coelho + * Copyright (C) 2015 Nino de Wit * * Permission to use, copy, modify, and/or distribute this software for any purpose with * or without fee is hereby granted, provided that the above copyright notice and this @@ -17,7 +16,7 @@ #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED #define DISTRHO_PLUGIN_INFO_H_INCLUDED -#define DISTRHO_PLUGIN_BRAND "Shiro" +#define DISTRHO_PLUGIN_BRAND "SHIRO" #define DISTRHO_PLUGIN_NAME "Modulay" #define DISTRHO_PLUGIN_URI "http://distrho.sf.net/plugins/Modulay" diff --git a/plugins/modulay/gen_exported.cpp b/plugins/modulay/gen_exported.cpp index 404b05a..92c87a0 100644 --- a/plugins/modulay/gen_exported.cpp +++ b/plugins/modulay/gen_exported.cpp @@ -31,22 +31,24 @@ static const int GENLIB_LOOPCOUNT_BAIL = 100000; // The State struct contains all the state and procedures for the gendsp kernel typedef struct State { CommonState __commonstate; - Delay m_delay_2; + DCBlock m_dcblock_15; Delay m_delay_3; - SineCycle m_cycle_14; + Delay m_delay_4; + SineCycle m_cycle_16; SineData __sinedata; - double m_bleed_9; - double m_rate_11; - double m_time_12; - double m_cutoff_10; - double m_feedback_13; - double m_repeats_8; - double m_depth_6; - double m_mix_5; - double m_feedforward_7; - double m_y_1; + double m_repeats_10; + double m_mix_12; + double m_rate_13; + double m_depth_11; + double m_delay_14; + double m_cutoff_9; + double m_time_7; + double m_feedback_6; double samplerate; - double m_delay_4; + double m_bleed_8; + double m_y_1; + double m_feedforward_5; + double m_history_2; int vectorsize; int __exception; // re-initialize all member variables; @@ -55,19 +57,21 @@ typedef struct State { vectorsize = __vs; samplerate = __sr; m_y_1 = 0; - m_delay_2.reset("m_delay_2", 44100); - m_delay_3.reset("m_delay_3", 44100); - m_delay_4 = 0; - m_mix_5 = 1; - m_depth_6 = 0; - m_feedforward_7 = 1; - m_repeats_8 = 0.75; - m_bleed_9 = 0; - m_cutoff_10 = 4000; - m_rate_11 = 2; - m_time_12 = 500; - m_feedback_13 = 0; - m_cycle_14.reset(samplerate, 0); + m_history_2 = 0; + m_delay_3.reset("m_delay_3", 48000); + m_delay_4.reset("m_delay_4", 48000); + m_feedforward_5 = 100; + m_feedback_6 = 0; + m_time_7 = 500; + m_bleed_8 = 0; + m_cutoff_9 = 2500; + m_repeats_10 = 75; + m_depth_11 = 1; + m_mix_12 = 100; + m_rate_13 = 2; + m_delay_14 = 0; + m_dcblock_15.reset(); + m_cycle_16.reset(samplerate, 0); genlib_reset_complete(this); }; @@ -84,39 +88,50 @@ typedef struct State { return __exception; }; - double mstosamps_4908 = (m_time_12 * (samplerate * 0.001)); - double expr_4909 = safediv(((m_cutoff_10 * 2) * 3.1415926535898), 44100); - double sin_4889 = sin(expr_4909); - double clamp_4890 = ((sin_4889 <= 1e-05) ? 1e-05 : ((sin_4889 >= 0.99999) ? 0.99999 : sin_4889)); + double mul_1174 = (m_mix_12 * 0.01); + double mstosamps_1200 = (m_time_7 * (samplerate * 0.001)); + double expr_1204 = safediv(((m_cutoff_9 * 2) * 3.1415926535898), 48000); + double sin_1181 = sin(expr_1204); + double clamp_1182 = ((sin_1181 <= 1e-05) ? 1e-05 : ((sin_1181 >= 0.99999) ? 0.99999 : sin_1181)); + double mul_1176 = (m_bleed_8 * 0.01); + double mul_1175 = (m_feedforward_5 * 0.01); + double mul_1178 = (m_repeats_10 * 0.01); + double mul_1177 = (m_feedback_6 * 0.01); // the main sample loop; while ((__n--)) { const double in1 = (*(__in1++)); - double tap_4907 = m_delay_3.read_linear(mstosamps_4908); - double mix_4936 = (m_y_1 + (clamp_4890 * (tap_4907 - m_y_1))); - double mix_4887 = mix_4936; - double mul_4904 = (mix_4887 * m_repeats_8); - m_cycle_14.freq(m_rate_11); - double cycle_4893 = m_cycle_14(__sinedata); - double cycleindex_4894 = m_cycle_14.phase(); - double add_4892 = (cycle_4893 + 1); - double mul_4891 = (add_4892 * 0.5); - double mul_4896 = (m_depth_6 * mul_4891); - double add_4895 = (m_delay_4 + mul_4896); - double mstosamps_4886 = (add_4895 * (samplerate * 0.001)); - double tap_4901 = m_delay_2.read_linear(mstosamps_4886); - double mul_4899 = (tap_4901 * m_feedforward_7); - double mul_4897 = (tap_4901 * m_feedback_13); - double add_4903 = (mix_4887 + mul_4897); - double mul_4898 = (add_4903 * m_bleed_9); - double add_4902 = (mul_4898 + mul_4899); - double mul_4905 = (add_4902 * m_mix_5); - double out1 = (mul_4905 + in1); - double y0_next_4910 = mix_4887; - m_delay_3.write((mul_4904 + in1)); - m_delay_2.write(add_4903); - m_y_1 = y0_next_4910; - m_delay_2.step(); + double mix_1214 = (m_history_2 + (0.01 * (mstosamps_1200 - m_history_2))); + double mix_1201 = mix_1214; + double tap_1199 = m_delay_4.read_linear(mix_1201); + double mix_1215 = (m_y_1 + (clamp_1182 * (tap_1199 - m_y_1))); + double mix_1180 = mix_1215; + double mul_1196 = (mix_1180 * mul_1178); + double clamp_1205 = ((mul_1196 <= -1) ? -1 : ((mul_1196 >= 1) ? 1 : mul_1196)); + double dcblock_1203 = m_dcblock_15(mix_1180); + m_cycle_16.freq(m_rate_13); + double cycle_1185 = m_cycle_16(__sinedata); + double cycleindex_1186 = m_cycle_16.phase(); + double add_1184 = (cycle_1185 + 1); + double mul_1183 = (add_1184 * 0.5); + double mul_1188 = (m_depth_11 * mul_1183); + double add_1187 = (m_delay_14 + mul_1188); + double mstosamps_1179 = (add_1187 * (samplerate * 0.001)); + double tap_1193 = m_delay_3.read_linear(mstosamps_1179); + double mul_1191 = (tap_1193 * mul_1175); + double mul_1189 = (tap_1193 * mul_1177); + double add_1195 = (dcblock_1203 + mul_1189); + double mul_1190 = (add_1195 * mul_1176); + double add_1194 = (mul_1190 + mul_1191); + double mul_1197 = (add_1194 * mul_1174); + double out1 = (mul_1197 + in1); + double history_1202_next_1206 = mix_1201; + double y0_next_1207 = mix_1180; + m_delay_4.write((clamp_1205 + in1)); + m_delay_3.write(add_1195); + m_history_2 = history_1202_next_1206; + m_y_1 = y0_next_1207; m_delay_3.step(); + m_delay_4.step(); // assign results to output buffer; (*(__out1++)) = out1; @@ -124,35 +139,35 @@ typedef struct State { return __exception; }; - inline void set_delay(double _value) { - m_delay_4 = (_value < 0 ? 0 : (_value > 30 ? 30 : _value)); + inline void set_feedforward(double _value) { + m_feedforward_5 = (_value < 70 ? 70 : (_value > 100 ? 100 : _value)); }; - inline void set_mix(double _value) { - m_mix_5 = (_value < 0 ? 0 : (_value > 1 ? 1 : _value)); + inline void set_feedback(double _value) { + m_feedback_6 = (_value < -70 ? -70 : (_value > 70 ? 70 : _value)); }; - inline void set_depth(double _value) { - m_depth_6 = (_value < 0 ? 0 : (_value > 5 ? 5 : _value)); + inline void set_time(double _value) { + m_time_7 = (_value < 10 ? 10 : (_value > 1000 ? 1000 : _value)); }; - inline void set_feedforward(double _value) { - m_feedforward_7 = (_value < 0.7 ? 0.7 : (_value > 1 ? 1 : _value)); + inline void set_bleed(double _value) { + m_bleed_8 = (_value < 0 ? 0 : (_value > 70 ? 70 : _value)); + }; + inline void set_cutoff(double _value) { + m_cutoff_9 = (_value < 0 ? 0 : (_value > 6000 ? 6000 : _value)); }; inline void set_repeats(double _value) { - m_repeats_8 = (_value < 0 ? 0 : (_value > 0.99 ? 0.99 : _value)); + m_repeats_10 = (_value < 0 ? 0 : (_value > 100 ? 100 : _value)); }; - inline void set_bleed(double _value) { - m_bleed_9 = (_value < 0 ? 0 : (_value > 0.7 ? 0.7 : _value)); + inline void set_depth(double _value) { + m_depth_11 = (_value < 0 ? 0 : (_value > 5 ? 5 : _value)); }; - inline void set_cutoff(double _value) { - m_cutoff_10 = (_value < 0 ? 0 : (_value > 6000 ? 6000 : _value)); + inline void set_mix(double _value) { + m_mix_12 = (_value < 0 ? 0 : (_value > 100 ? 100 : _value)); }; inline void set_rate(double _value) { - m_rate_11 = (_value < 0.1 ? 0.1 : (_value > 10 ? 10 : _value)); - }; - inline void set_time(double _value) { - m_time_12 = (_value < 10 ? 10 : (_value > 1000 ? 1000 : _value)); + m_rate_13 = (_value < 0.1 ? 0.1 : (_value > 10 ? 10 : _value)); }; - inline void set_feedback(double _value) { - m_feedback_13 = (_value < -0.7 ? -0.7 : (_value > 0.7 ? 0.7 : _value)); + inline void set_delay(double _value) { + m_delay_14 = (_value < 0 ? 0 : (_value > 30 ? 30 : _value)); }; } State; @@ -195,16 +210,16 @@ void reset(CommonState *cself) { void setparameter(CommonState *cself, long index, double value, void *ref) { State * self = (State *)cself; switch (index) { - case 0: self->set_delay(value); break; - case 1: self->set_mix(value); break; - case 2: self->set_depth(value); break; - case 3: self->set_feedforward(value); break; - case 4: self->set_repeats(value); break; - case 5: self->set_bleed(value); break; - case 6: self->set_cutoff(value); break; - case 7: self->set_rate(value); break; - case 8: self->set_time(value); break; - case 9: self->set_feedback(value); break; + case 0: self->set_feedforward(value); break; + case 1: self->set_feedback(value); break; + case 2: self->set_time(value); break; + case 3: self->set_bleed(value); break; + case 4: self->set_cutoff(value); break; + case 5: self->set_repeats(value); break; + case 6: self->set_depth(value); break; + case 7: self->set_mix(value); break; + case 8: self->set_rate(value); break; + case 9: self->set_delay(value); break; default: break; } @@ -215,16 +230,16 @@ void setparameter(CommonState *cself, long index, double value, void *ref) { void getparameter(CommonState *cself, long index, double *value) { State *self = (State *)cself; switch (index) { - case 0: *value = self->m_delay_4; break; - case 1: *value = self->m_mix_5; break; - case 2: *value = self->m_depth_6; break; - case 3: *value = self->m_feedforward_7; break; - case 4: *value = self->m_repeats_8; break; - case 5: *value = self->m_bleed_9; break; - case 6: *value = self->m_cutoff_10; break; - case 7: *value = self->m_rate_11; break; - case 8: *value = self->m_time_12; break; - case 9: *value = self->m_feedback_13; break; + case 0: *value = self->m_feedforward_5; break; + case 1: *value = self->m_feedback_6; break; + case 2: *value = self->m_time_7; break; + case 3: *value = self->m_bleed_8; break; + case 4: *value = self->m_cutoff_9; break; + case 5: *value = self->m_repeats_10; break; + case 6: *value = self->m_depth_11; break; + case 7: *value = self->m_mix_12; break; + case 8: *value = self->m_rate_13; break; + case 9: *value = self->m_delay_14; break; default: break; } @@ -244,144 +259,144 @@ void * create(double sr, long vs) { self->__commonstate.vs = vs; self->__commonstate.params = (ParamInfo *)genlib_sysmem_newptr(10 * sizeof(ParamInfo)); self->__commonstate.numparams = 10; - // initialize parameter 0 ("m_delay_4") + // initialize parameter 0 ("m_feedforward_5") pi = self->__commonstate.params + 0; - pi->name = "delay"; + pi->name = "feedforward"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_delay_4; + pi->defaultvalue = self->m_feedforward_5; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; - pi->outputmin = 0; - pi->outputmax = 30; + pi->outputmin = 70; + pi->outputmax = 100; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 1 ("m_mix_5") + // initialize parameter 1 ("m_feedback_6") pi = self->__commonstate.params + 1; - pi->name = "mix"; + pi->name = "feedback"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_mix_5; + pi->defaultvalue = self->m_feedback_6; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; - pi->outputmin = 0; - pi->outputmax = 1; + pi->outputmin = -70; + pi->outputmax = 70; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 2 ("m_depth_6") + // initialize parameter 2 ("m_time_7") pi = self->__commonstate.params + 2; - pi->name = "depth"; + pi->name = "time"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_depth_6; + pi->defaultvalue = self->m_time_7; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; - pi->outputmin = 0; - pi->outputmax = 5; + pi->outputmin = 10; + pi->outputmax = 1000; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 3 ("m_feedforward_7") + // initialize parameter 3 ("m_bleed_8") pi = self->__commonstate.params + 3; - pi->name = "feedforward"; + pi->name = "bleed"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_feedforward_7; + pi->defaultvalue = self->m_bleed_8; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; - pi->outputmin = 0.7; - pi->outputmax = 1; + pi->outputmin = 0; + pi->outputmax = 70; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 4 ("m_repeats_8") + // initialize parameter 4 ("m_cutoff_9") pi = self->__commonstate.params + 4; - pi->name = "repeats"; + pi->name = "cutoff"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_repeats_8; + pi->defaultvalue = self->m_cutoff_9; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; pi->outputmin = 0; - pi->outputmax = 0.99; + pi->outputmax = 6000; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 5 ("m_bleed_9") + // initialize parameter 5 ("m_repeats_10") pi = self->__commonstate.params + 5; - pi->name = "bleed"; + pi->name = "repeats"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_bleed_9; + pi->defaultvalue = self->m_repeats_10; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; pi->outputmin = 0; - pi->outputmax = 0.7; + pi->outputmax = 100; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 6 ("m_cutoff_10") + // initialize parameter 6 ("m_depth_11") pi = self->__commonstate.params + 6; - pi->name = "cutoff"; + pi->name = "depth"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_cutoff_10; + pi->defaultvalue = self->m_depth_11; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; pi->outputmin = 0; - pi->outputmax = 6000; + pi->outputmax = 5; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 7 ("m_rate_11") + // initialize parameter 7 ("m_mix_12") pi = self->__commonstate.params + 7; - pi->name = "rate"; + pi->name = "mix"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_rate_11; + pi->defaultvalue = self->m_mix_12; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; - pi->outputmin = 0.1; - pi->outputmax = 10; + pi->outputmin = 0; + pi->outputmax = 100; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 8 ("m_time_12") + // initialize parameter 8 ("m_rate_13") pi = self->__commonstate.params + 8; - pi->name = "time"; + pi->name = "rate"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_time_12; + pi->defaultvalue = self->m_rate_13; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; - pi->outputmin = 10; - pi->outputmax = 1000; + pi->outputmin = 0.1; + pi->outputmax = 10; pi->exp = 0; pi->units = ""; // no units defined - // initialize parameter 9 ("m_feedback_13") + // initialize parameter 9 ("m_delay_14") pi = self->__commonstate.params + 9; - pi->name = "feedback"; + pi->name = "delay"; pi->paramtype = GENLIB_PARAMTYPE_FLOAT; - pi->defaultvalue = self->m_feedback_13; + pi->defaultvalue = self->m_delay_14; pi->defaultref = 0; pi->hasinputminmax = false; pi->inputmin = 0; pi->inputmax = 1; pi->hasminmax = true; - pi->outputmin = -0.7; - pi->outputmax = 0.7; + pi->outputmin = 0; + pi->outputmax = 30; pi->exp = 0; pi->units = ""; // no units defined diff --git a/plugins/modulay/modulay.gendsp b/plugins/modulay/modulay.gendsp index 81ffdda..db2f408 100644 --- a/plugins/modulay/modulay.gendsp +++ b/plugins/modulay/modulay.gendsp @@ -29,6 +29,132 @@ "digest" : "", "tags" : "", "boxes" : [ { + "box" : { + "fontname" : "Arial", + "fontsize" : 12.0, + "id" : "obj-47", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 30.5, 307.0, 51.0, 20.0 ], + "text" : "dcblock" + } + + } +, { + "box" : { + "fontname" : "Arial", + "fontsize" : 12.0, + "id" : "obj-46", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 89.0, 307.0, 53.0, 20.0 ], + "text" : "clip -1 1" + } + + } +, { + "box" : { + "fontname" : "Arial", + "fontsize" : 12.0, + "id" : "obj-13", + "maxclass" : "newobj", + "numinlets" : 2, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 61.5, 57.0, 56.0, 20.0 ], + "text" : "mix 0.01" + } + + } +, { + "box" : { + "fontname" : "Arial", + "fontsize" : 12.0, + "id" : "obj-37", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 124.5, 57.0, 46.0, 20.0 ], + "text" : "history" + } + + } +, { + "box" : { + "fontname" : "Arial", + "fontsize" : 12.0, + "id" : "obj-12", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 108.5, 742.0, 42.0, 20.0 ], + "text" : "* 0.01" + } + + } +, { + "box" : { + "fontname" : "Arial", + "fontsize" : 12.0, + "id" : "obj-10", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 89.5, 692.0, 42.0, 20.0 ], + "text" : "* 0.01" + } + + } +, { + "box" : { + "fontname" : "Arial", + "fontsize" : 12.0, + "id" : "obj-9", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 43.5, 667.0, 42.0, 20.0 ], + "text" : "* 0.01" + } + + } +, { + "box" : { + "fontname" : "Arial", + "fontsize" : 12.0, + "id" : "obj-8", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 168.5, 577.0, 42.0, 20.0 ], + "text" : "* 0.01" + } + + } +, { + "box" : { + "fontname" : "Arial", + "fontsize" : 12.0, + "id" : "obj-7", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 103.0, 252.0, 42.0, 20.0 ], + "text" : "* 0.01" + } + + } +, { "box" : { "fontname" : "Arial", "fontsize" : 12.0, @@ -37,7 +163,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 96.5, 492.0, 72.0, 20.0 ], + "patching_rect" : [ 96.5, 552.0, 72.0, 20.0 ], "text" : "mstosamps" } @@ -51,7 +177,7 @@ "numinlets" : 3, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 30.5, 217.0, 46.0, 20.0 ], + "patching_rect" : [ 30.5, 252.0, 46.0, 20.0 ], "text" : "mix" } @@ -65,8 +191,8 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 57.5, 117.0, 170.0, 20.0 ], - "text" : "expr out=in1*2*PI/samplerate\\;" + "patching_rect" : [ 57.5, 152.0, 144.0, 20.0 ], + "text" : "expr out=in1*2*PI/48000\\;" } } @@ -79,7 +205,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 30.5, 192.0, 72.0, 20.0 ], + "patching_rect" : [ 30.5, 227.0, 72.0, 20.0 ], "text" : "history y0 0" } @@ -93,7 +219,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 57.5, 142.0, 26.0, 20.0 ], + "patching_rect" : [ 57.5, 177.0, 26.0, 20.0 ], "text" : "sin" } @@ -107,7 +233,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 57.5, 167.0, 125.0, 20.0 ], + "patching_rect" : [ 57.5, 202.0, 125.0, 20.0 ], "text" : "clip 0.00001 0.99999" } @@ -121,8 +247,8 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 57.5, 92.0, 220.0, 20.0 ], - "text" : "param cutoff 4000 @min 0 @max 6000" + "patching_rect" : [ 57.5, 127.0, 220.0, 20.0 ], + "text" : "param cutoff 2500 @min 0 @max 6000" } } @@ -135,7 +261,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 147.5, 417.0, 35.0, 20.0 ], + "patching_rect" : [ 147.5, 477.0, 35.0, 20.0 ], "text" : "* 0.5" } @@ -149,7 +275,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 147.5, 392.0, 28.0, 20.0 ], + "patching_rect" : [ 147.5, 452.0, 28.0, 20.0 ], "text" : "+ 1" } @@ -163,7 +289,7 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 147.5, 342.0, 188.0, 20.0 ], + "patching_rect" : [ 147.5, 402.0, 188.0, 20.0 ], "text" : "param rate 2 @min 0.1 @max 10" } @@ -177,7 +303,7 @@ "numinlets" : 1, "numoutlets" : 2, "outlettype" : [ "", "" ], - "patching_rect" : [ 147.5, 367.0, 38.0, 20.0 ], + "patching_rect" : [ 147.5, 427.0, 38.0, 20.0 ], "text" : "cycle" } @@ -191,7 +317,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 96.5, 467.0, 57.0, 20.0 ], + "patching_rect" : [ 96.5, 527.0, 57.0, 20.0 ], "text" : "+" } @@ -205,7 +331,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 134.5, 442.0, 32.5, 20.0 ], + "patching_rect" : [ 134.5, 502.0, 32.5, 20.0 ], "text" : "*" } @@ -219,8 +345,8 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 134.5, 317.0, 181.0, 20.0 ], - "text" : "param depth 0 @min 0 @max 5" + "patching_rect" : [ 134.5, 377.0, 181.0, 20.0 ], + "text" : "param depth 1 @min 0 @max 5" } } @@ -233,7 +359,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 121.0, 547.0, 32.5, 20.0 ], + "patching_rect" : [ 155.0, 607.0, 32.5, 20.0 ], "text" : "*" } @@ -247,7 +373,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 30.0, 632.0, 32.5, 20.0 ], + "patching_rect" : [ 30.0, 692.0, 32.5, 20.0 ], "text" : "*" } @@ -261,7 +387,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 76.0, 632.0, 32.5, 20.0 ], + "patching_rect" : [ 76.0, 717.0, 32.5, 20.0 ], "text" : "*" } @@ -275,7 +401,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 77.0, 517.0, 39.0, 20.0 ], + "patching_rect" : [ 77.0, 577.0, 39.0, 20.0 ], "text" : "delay" } @@ -289,7 +415,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 30.0, 657.0, 65.0, 20.0 ], + "patching_rect" : [ 30.0, 742.0, 65.0, 20.0 ], "text" : "+" } @@ -303,7 +429,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 31.0, 292.0, 32.5, 20.0 ], + "patching_rect" : [ 31.0, 352.0, 32.5, 20.0 ], "text" : "+" } @@ -317,8 +443,8 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 134.5, 517.0, 224.0, 20.0 ], - "text" : "param feedback 0 @min -0.7 @max 0.7" + "patching_rect" : [ 168.5, 552.0, 217.0, 20.0 ], + "text" : "param feedback 0 @min -70 @max 70" } } @@ -331,8 +457,8 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 43.5, 582.0, 190.0, 20.0 ], - "text" : "param bleed 0 @min 0 @max 0.7" + "patching_rect" : [ 43.5, 642.0, 187.0, 20.0 ], + "text" : "param bleed 0 @min 0 @max 70" } } @@ -345,7 +471,7 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 97.0, 292.0, 186.0, 20.0 ], + "patching_rect" : [ 97.0, 352.0, 186.0, 20.0 ], "text" : "param delay 0 @min 0 @max 30" } @@ -359,8 +485,8 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 89.5, 607.0, 224.0, 20.0 ], - "text" : "param feedforward 1 @min 0.7 @max 1" + "patching_rect" : [ 89.5, 667.0, 248.0, 20.0 ], + "text" : "param feedforward 100 @min 70 @max 100" } } @@ -373,8 +499,8 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 96.5, 217.0, 224.0, 20.0 ], - "text" : "param repeats 0.75 @min 0 @max 0.99" + "patching_rect" : [ 103.0, 227.0, 211.0, 20.0 ], + "text" : "param repeats 75 @min 0 @max 100" } } @@ -387,7 +513,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 83.0, 247.0, 32.5, 20.0 ], + "patching_rect" : [ 89.0, 282.0, 32.5, 20.0 ], "text" : "*" } @@ -401,8 +527,8 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 43.5, 682.0, 170.0, 20.0 ], - "text" : "param mix 1 @min 0 @max 1" + "patching_rect" : [ 108.5, 717.0, 196.0, 20.0 ], + "text" : "param mix 100 @min 0 @max 100" } } @@ -415,7 +541,7 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 61.5, 2.0, 214.0, 20.0 ], + "patching_rect" : [ 98.5, 2.0, 214.0, 20.0 ], "text" : "param time 500 @min 10 @max 1000" } @@ -429,7 +555,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 30.0, 707.0, 32.5, 20.0 ], + "patching_rect" : [ 30.0, 771.0, 32.5, 20.0 ], "text" : "*" } @@ -443,7 +569,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 42.0, 67.0, 39.0, 20.0 ], + "patching_rect" : [ 42.0, 102.0, 39.0, 20.0 ], "text" : "delay" } @@ -457,7 +583,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 61.5, 27.0, 72.0, 20.0 ], + "patching_rect" : [ 98.5, 27.0, 72.0, 20.0 ], "text" : "mstosamps" } @@ -484,7 +610,7 @@ "maxclass" : "newobj", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 16.0, 737.0, 37.0, 20.0 ], + "patching_rect" : [ 16.0, 801.0, 37.0, 20.0 ], "text" : "out 1" } @@ -495,7 +621,7 @@ "destination" : [ "obj-21", 0 ], "disabled" : 0, "hidden" : 0, - "midpoints" : [ 25.5, 44.0, 51.5, 44.0 ], + "midpoints" : [ 25.5, 50.0, 51.5, 50.0 ], "source" : [ "obj-1", 0 ] } @@ -508,6 +634,15 @@ "source" : [ "obj-1", 0 ] } + } +, { + "patchline" : { + "destination" : [ "obj-30", 1 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-10", 0 ] + } + } , { "patchline" : { @@ -517,32 +652,61 @@ "source" : [ "obj-11", 0 ] } + } +, { + "patchline" : { + "destination" : [ "obj-34", 1 ], + "disabled" : 0, + "hidden" : 0, + "midpoints" : [ 118.0, 766.0, 53.0, 766.0 ], + "source" : [ "obj-12", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-21", 1 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-13", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-37", 0 ], + "disabled" : 0, + "hidden" : 0, + "midpoints" : [ 71.0, 84.0, 176.5, 84.0, 176.5, 50.0, 134.0, 50.0 ], + "source" : [ "obj-13", 0 ] + } + } , { "patchline" : { "destination" : [ "obj-24", 0 ], "disabled" : 0, "hidden" : 0, - "midpoints" : [ 40.0, 244.0, 11.0, 244.0, 11.0, 184.0, 40.0, 184.0 ], + "midpoints" : [ 40.0, 279.0, 11.0, 279.0, 11.0, 219.0, 40.0, 219.0 ], "source" : [ "obj-15", 0 ] } } , { "patchline" : { - "destination" : [ "obj-27", 0 ], + "destination" : [ "obj-43", 0 ], "disabled" : 0, "hidden" : 0, + "midpoints" : [ 40.0, 276.5, 98.5, 276.5 ], "source" : [ "obj-15", 0 ] } } , { "patchline" : { - "destination" : [ "obj-43", 0 ], + "destination" : [ "obj-47", 0 ], "disabled" : 0, "hidden" : 0, - "midpoints" : [ 40.0, 241.5, 92.5, 241.5 ], "source" : [ "obj-15", 0 ] } @@ -558,7 +722,7 @@ } , { "patchline" : { - "destination" : [ "obj-30", 1 ], + "destination" : [ "obj-10", 0 ], "disabled" : 0, "hidden" : 0, "source" : [ "obj-2", 0 ] @@ -567,7 +731,7 @@ } , { "patchline" : { - "destination" : [ "obj-21", 1 ], + "destination" : [ "obj-13", 1 ], "disabled" : 0, "hidden" : 0, "source" : [ "obj-20", 0 ] @@ -633,7 +797,7 @@ "destination" : [ "obj-33", 0 ], "disabled" : 0, "hidden" : 0, - "midpoints" : [ 86.5, 541.5, 130.5, 541.5 ], + "midpoints" : [ 86.5, 601.5, 164.5, 601.5 ], "source" : [ "obj-29", 0 ] } @@ -679,7 +843,7 @@ "destination" : [ "obj-27", 1 ], "disabled" : 0, "hidden" : 0, - "midpoints" : [ 130.5, 575.0, 363.0, 575.0, 363.0, 324.0, 363.0, 324.0, 363.0, 283.0, 54.0, 283.0 ], + "midpoints" : [ 164.5, 635.0, 393.0, 635.0, 393.0, 384.0, 393.0, 384.0, 393.0, 343.0, 54.0, 343.0 ], "source" : [ "obj-33", 0 ] } @@ -689,7 +853,7 @@ "destination" : [ "obj-4", 0 ], "disabled" : 0, "hidden" : 0, - "midpoints" : [ 39.5, 731.5, 25.5, 731.5 ], + "midpoints" : [ 39.5, 795.5, 25.5, 795.5 ], "source" : [ "obj-34", 0 ] } @@ -711,6 +875,16 @@ "source" : [ "obj-36", 0 ] } + } +, { + "patchline" : { + "destination" : [ "obj-13", 0 ], + "disabled" : 0, + "hidden" : 0, + "midpoints" : [ 134.0, 79.0, 122.5, 79.0, 122.5, 51.0, 71.0, 51.0 ], + "source" : [ "obj-37", 0 ] + } + } , { "patchline" : { @@ -732,7 +906,7 @@ } , { "patchline" : { - "destination" : [ "obj-34", 1 ], + "destination" : [ "obj-12", 0 ], "disabled" : 0, "hidden" : 0, "source" : [ "obj-42", 0 ] @@ -741,22 +915,40 @@ } , { "patchline" : { - "destination" : [ "obj-21", 0 ], + "destination" : [ "obj-46", 0 ], "disabled" : 0, "hidden" : 0, - "midpoints" : [ 92.5, 274.0, 361.25, 274.0, 361.25, 58.0, 51.5, 58.0 ], "source" : [ "obj-43", 0 ] } } , { "patchline" : { - "destination" : [ "obj-43", 1 ], + "destination" : [ "obj-7", 0 ], "disabled" : 0, "hidden" : 0, "source" : [ "obj-44", 0 ] } + } +, { + "patchline" : { + "destination" : [ "obj-21", 0 ], + "disabled" : 0, + "hidden" : 0, + "midpoints" : [ 98.5, 335.0, 392.25, 335.0, 392.25, 93.0, 51.5, 93.0 ], + "source" : [ "obj-46", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-27", 0 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-47", 0 ] + } + } , { "patchline" : { @@ -769,7 +961,7 @@ } , { "patchline" : { - "destination" : [ "obj-32", 1 ], + "destination" : [ "obj-9", 0 ], "disabled" : 0, "hidden" : 0, "source" : [ "obj-5", 0 ] @@ -805,7 +997,7 @@ } , { "patchline" : { - "destination" : [ "obj-33", 1 ], + "destination" : [ "obj-8", 0 ], "disabled" : 0, "hidden" : 0, "source" : [ "obj-6", 0 ] @@ -829,6 +1021,33 @@ "source" : [ "obj-62", 0 ] } + } +, { + "patchline" : { + "destination" : [ "obj-43", 1 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-7", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-33", 1 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-8", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-32", 1 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-9", 0 ] + } + } ] } diff --git a/plugins/modulay/modulay.maxpat b/plugins/modulay/modulay.maxpat index 175902f..7fd4341 100644 --- a/plugins/modulay/modulay.maxpat +++ b/plugins/modulay/modulay.maxpat @@ -8,7 +8,7 @@ "architecture" : "x86" } , - "rect" : [ 0.0, 45.0, 960.0, 705.0 ], + "rect" : [ 0.0, 97.0, 960.0, 653.0 ], "bglocked" : 0, "openinpresentation" : 0, "default_fontsize" : 12.0, @@ -139,7 +139,7 @@ "fontsize" : 12.0, "id" : "obj-14", "maxclass" : "flonum", - "maximum" : 0.7, + "maximum" : 70.0, "minimum" : 0.0, "numinlets" : 1, "numoutlets" : 2, @@ -197,8 +197,8 @@ "fontsize" : 12.0, "id" : "obj-3", "maxclass" : "flonum", - "maximum" : 0.7, - "minimum" : -0.7, + "maximum" : 70.0, + "minimum" : -70.0, "numinlets" : 1, "numoutlets" : 2, "outlettype" : [ "float", "bang" ], @@ -213,8 +213,8 @@ "fontsize" : 12.0, "id" : "obj-5", "maxclass" : "flonum", - "maximum" : 1.0, - "minimum" : 0.7, + "maximum" : 100.0, + "minimum" : 70.0, "numinlets" : 1, "numoutlets" : 2, "outlettype" : [ "float", "bang" ], @@ -288,7 +288,7 @@ "id" : "obj-25", "maxclass" : "flonum", "maximum" : 1000.0, - "minimum" : 20.0, + "minimum" : 10.0, "numinlets" : 1, "numoutlets" : 2, "outlettype" : [ "float", "bang" ], @@ -303,7 +303,7 @@ "fontsize" : 12.0, "id" : "obj-20", "maxclass" : "flonum", - "maximum" : 0.99, + "maximum" : 100.0, "minimum" : 0.0, "numinlets" : 1, "numoutlets" : 2, @@ -319,7 +319,7 @@ "fontsize" : 12.0, "id" : "obj-19", "maxclass" : "flonum", - "maximum" : 1.0, + "maximum" : 100.0, "minimum" : 0.0, "numinlets" : 1, "numoutlets" : 2, @@ -445,6 +445,132 @@ "digest" : "", "tags" : "", "boxes" : [ { + "box" : { + "fontname" : "Arial", + "fontsize" : 12.0, + "id" : "obj-47", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 30.5, 307.0, 51.0, 20.0 ], + "text" : "dcblock" + } + + } +, { + "box" : { + "fontname" : "Arial", + "fontsize" : 12.0, + "id" : "obj-46", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 89.0, 307.0, 53.0, 20.0 ], + "text" : "clip -1 1" + } + + } +, { + "box" : { + "fontname" : "Arial", + "fontsize" : 12.0, + "id" : "obj-13", + "maxclass" : "newobj", + "numinlets" : 2, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 61.5, 57.0, 56.0, 20.0 ], + "text" : "mix 0.01" + } + + } +, { + "box" : { + "fontname" : "Arial", + "fontsize" : 12.0, + "id" : "obj-37", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 124.5, 57.0, 46.0, 20.0 ], + "text" : "history" + } + + } +, { + "box" : { + "fontname" : "Arial", + "fontsize" : 12.0, + "id" : "obj-12", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 108.5, 742.0, 42.0, 20.0 ], + "text" : "* 0.01" + } + + } +, { + "box" : { + "fontname" : "Arial", + "fontsize" : 12.0, + "id" : "obj-10", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 89.5, 692.0, 42.0, 20.0 ], + "text" : "* 0.01" + } + + } +, { + "box" : { + "fontname" : "Arial", + "fontsize" : 12.0, + "id" : "obj-9", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 43.5, 667.0, 42.0, 20.0 ], + "text" : "* 0.01" + } + + } +, { + "box" : { + "fontname" : "Arial", + "fontsize" : 12.0, + "id" : "obj-8", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 168.5, 577.0, 42.0, 20.0 ], + "text" : "* 0.01" + } + + } +, { + "box" : { + "fontname" : "Arial", + "fontsize" : 12.0, + "id" : "obj-7", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 103.0, 252.0, 42.0, 20.0 ], + "text" : "* 0.01" + } + + } +, { "box" : { "fontname" : "Arial", "fontsize" : 12.0, @@ -453,7 +579,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 96.5, 492.0, 72.0, 20.0 ], + "patching_rect" : [ 96.5, 552.0, 72.0, 20.0 ], "text" : "mstosamps" } @@ -467,7 +593,7 @@ "numinlets" : 3, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 30.5, 217.0, 46.0, 20.0 ], + "patching_rect" : [ 30.5, 252.0, 46.0, 20.0 ], "text" : "mix" } @@ -481,8 +607,8 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 57.5, 117.0, 170.0, 20.0 ], - "text" : "expr out=in1*2*PI/samplerate\\;" + "patching_rect" : [ 57.5, 152.0, 144.0, 20.0 ], + "text" : "expr out=in1*2*PI/48000\\;" } } @@ -495,7 +621,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 30.5, 192.0, 72.0, 20.0 ], + "patching_rect" : [ 30.5, 227.0, 72.0, 20.0 ], "text" : "history y0 0" } @@ -509,7 +635,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 57.5, 142.0, 26.0, 20.0 ], + "patching_rect" : [ 57.5, 177.0, 26.0, 20.0 ], "text" : "sin" } @@ -523,7 +649,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 57.5, 167.0, 125.0, 20.0 ], + "patching_rect" : [ 57.5, 202.0, 125.0, 20.0 ], "text" : "clip 0.00001 0.99999" } @@ -537,8 +663,8 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 57.5, 92.0, 220.0, 20.0 ], - "text" : "param cutoff 4000 @min 0 @max 6000" + "patching_rect" : [ 57.5, 127.0, 220.0, 20.0 ], + "text" : "param cutoff 2500 @min 0 @max 6000" } } @@ -551,7 +677,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 147.5, 417.0, 35.0, 20.0 ], + "patching_rect" : [ 147.5, 477.0, 35.0, 20.0 ], "text" : "* 0.5" } @@ -565,7 +691,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 147.5, 392.0, 28.0, 20.0 ], + "patching_rect" : [ 147.5, 452.0, 28.0, 20.0 ], "text" : "+ 1" } @@ -579,7 +705,7 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 147.5, 342.0, 188.0, 20.0 ], + "patching_rect" : [ 147.5, 402.0, 188.0, 20.0 ], "text" : "param rate 2 @min 0.1 @max 10" } @@ -593,7 +719,7 @@ "numinlets" : 1, "numoutlets" : 2, "outlettype" : [ "", "" ], - "patching_rect" : [ 147.5, 367.0, 38.0, 20.0 ], + "patching_rect" : [ 147.5, 427.0, 38.0, 20.0 ], "text" : "cycle" } @@ -607,7 +733,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 96.5, 467.0, 57.0, 20.0 ], + "patching_rect" : [ 96.5, 527.0, 57.0, 20.0 ], "text" : "+" } @@ -621,7 +747,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 134.5, 442.0, 32.5, 20.0 ], + "patching_rect" : [ 134.5, 502.0, 32.5, 20.0 ], "text" : "*" } @@ -635,8 +761,8 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 134.5, 317.0, 181.0, 20.0 ], - "text" : "param depth 0 @min 0 @max 5" + "patching_rect" : [ 134.5, 377.0, 181.0, 20.0 ], + "text" : "param depth 1 @min 0 @max 5" } } @@ -649,7 +775,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 121.0, 547.0, 32.5, 20.0 ], + "patching_rect" : [ 155.0, 607.0, 32.5, 20.0 ], "text" : "*" } @@ -663,7 +789,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 30.0, 632.0, 32.5, 20.0 ], + "patching_rect" : [ 30.0, 692.0, 32.5, 20.0 ], "text" : "*" } @@ -677,7 +803,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 76.0, 632.0, 32.5, 20.0 ], + "patching_rect" : [ 76.0, 717.0, 32.5, 20.0 ], "text" : "*" } @@ -691,7 +817,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 77.0, 517.0, 39.0, 20.0 ], + "patching_rect" : [ 77.0, 577.0, 39.0, 20.0 ], "text" : "delay" } @@ -705,7 +831,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 30.0, 657.0, 65.0, 20.0 ], + "patching_rect" : [ 30.0, 742.0, 65.0, 20.0 ], "text" : "+" } @@ -719,7 +845,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 31.0, 292.0, 32.5, 20.0 ], + "patching_rect" : [ 31.0, 352.0, 32.5, 20.0 ], "text" : "+" } @@ -733,8 +859,8 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 134.5, 517.0, 224.0, 20.0 ], - "text" : "param feedback 0 @min -0.7 @max 0.7" + "patching_rect" : [ 168.5, 552.0, 217.0, 20.0 ], + "text" : "param feedback 0 @min -70 @max 70" } } @@ -747,8 +873,8 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 43.5, 582.0, 190.0, 20.0 ], - "text" : "param bleed 0 @min 0 @max 0.7" + "patching_rect" : [ 43.5, 642.0, 187.0, 20.0 ], + "text" : "param bleed 0 @min 0 @max 70" } } @@ -761,7 +887,7 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 97.0, 292.0, 186.0, 20.0 ], + "patching_rect" : [ 97.0, 352.0, 186.0, 20.0 ], "text" : "param delay 0 @min 0 @max 30" } @@ -775,8 +901,8 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 89.5, 607.0, 224.0, 20.0 ], - "text" : "param feedforward 1 @min 0.7 @max 1" + "patching_rect" : [ 89.5, 667.0, 248.0, 20.0 ], + "text" : "param feedforward 100 @min 70 @max 100" } } @@ -789,8 +915,8 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 96.5, 217.0, 224.0, 20.0 ], - "text" : "param repeats 0.75 @min 0 @max 0.99" + "patching_rect" : [ 103.0, 227.0, 211.0, 20.0 ], + "text" : "param repeats 75 @min 0 @max 100" } } @@ -803,7 +929,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 83.0, 247.0, 32.5, 20.0 ], + "patching_rect" : [ 89.0, 282.0, 32.5, 20.0 ], "text" : "*" } @@ -817,8 +943,8 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 43.5, 682.0, 170.0, 20.0 ], - "text" : "param mix 1 @min 0 @max 1" + "patching_rect" : [ 108.5, 717.0, 196.0, 20.0 ], + "text" : "param mix 100 @min 0 @max 100" } } @@ -831,7 +957,7 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 61.5, 2.0, 214.0, 20.0 ], + "patching_rect" : [ 98.5, 2.0, 214.0, 20.0 ], "text" : "param time 500 @min 10 @max 1000" } @@ -845,7 +971,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 30.0, 707.0, 32.5, 20.0 ], + "patching_rect" : [ 30.0, 771.0, 32.5, 20.0 ], "text" : "*" } @@ -859,7 +985,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 42.0, 67.0, 39.0, 20.0 ], + "patching_rect" : [ 42.0, 102.0, 39.0, 20.0 ], "text" : "delay" } @@ -873,7 +999,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 61.5, 27.0, 72.0, 20.0 ], + "patching_rect" : [ 98.5, 27.0, 72.0, 20.0 ], "text" : "mstosamps" } @@ -900,7 +1026,7 @@ "maxclass" : "newobj", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 16.0, 737.0, 37.0, 20.0 ], + "patching_rect" : [ 16.0, 801.0, 37.0, 20.0 ], "text" : "out 1" } @@ -911,7 +1037,7 @@ "destination" : [ "obj-21", 0 ], "disabled" : 0, "hidden" : 0, - "midpoints" : [ 25.5, 44.0, 51.5, 44.0 ], + "midpoints" : [ 25.5, 50.0, 51.5, 50.0 ], "source" : [ "obj-1", 0 ] } @@ -924,6 +1050,15 @@ "source" : [ "obj-1", 0 ] } + } +, { + "patchline" : { + "destination" : [ "obj-30", 1 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-10", 0 ] + } + } , { "patchline" : { @@ -933,32 +1068,61 @@ "source" : [ "obj-11", 0 ] } + } +, { + "patchline" : { + "destination" : [ "obj-34", 1 ], + "disabled" : 0, + "hidden" : 0, + "midpoints" : [ 118.0, 766.0, 53.0, 766.0 ], + "source" : [ "obj-12", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-21", 1 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-13", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-37", 0 ], + "disabled" : 0, + "hidden" : 0, + "midpoints" : [ 71.0, 84.0, 176.5, 84.0, 176.5, 50.0, 134.0, 50.0 ], + "source" : [ "obj-13", 0 ] + } + } , { "patchline" : { "destination" : [ "obj-24", 0 ], "disabled" : 0, "hidden" : 0, - "midpoints" : [ 40.0, 244.0, 11.0, 244.0, 11.0, 184.0, 40.0, 184.0 ], + "midpoints" : [ 40.0, 279.0, 11.0, 279.0, 11.0, 219.0, 40.0, 219.0 ], "source" : [ "obj-15", 0 ] } } , { "patchline" : { - "destination" : [ "obj-27", 0 ], + "destination" : [ "obj-43", 0 ], "disabled" : 0, "hidden" : 0, + "midpoints" : [ 40.0, 276.5, 98.5, 276.5 ], "source" : [ "obj-15", 0 ] } } , { "patchline" : { - "destination" : [ "obj-43", 0 ], + "destination" : [ "obj-47", 0 ], "disabled" : 0, "hidden" : 0, - "midpoints" : [ 40.0, 241.5, 92.5, 241.5 ], "source" : [ "obj-15", 0 ] } @@ -974,7 +1138,7 @@ } , { "patchline" : { - "destination" : [ "obj-30", 1 ], + "destination" : [ "obj-10", 0 ], "disabled" : 0, "hidden" : 0, "source" : [ "obj-2", 0 ] @@ -983,7 +1147,7 @@ } , { "patchline" : { - "destination" : [ "obj-21", 1 ], + "destination" : [ "obj-13", 1 ], "disabled" : 0, "hidden" : 0, "source" : [ "obj-20", 0 ] @@ -1049,7 +1213,7 @@ "destination" : [ "obj-33", 0 ], "disabled" : 0, "hidden" : 0, - "midpoints" : [ 86.5, 541.5, 130.5, 541.5 ], + "midpoints" : [ 86.5, 601.5, 164.5, 601.5 ], "source" : [ "obj-29", 0 ] } @@ -1095,7 +1259,7 @@ "destination" : [ "obj-27", 1 ], "disabled" : 0, "hidden" : 0, - "midpoints" : [ 130.5, 575.0, 363.0, 575.0, 363.0, 324.0, 363.0, 324.0, 363.0, 283.0, 54.0, 283.0 ], + "midpoints" : [ 164.5, 635.0, 393.0, 635.0, 393.0, 384.0, 393.0, 384.0, 393.0, 343.0, 54.0, 343.0 ], "source" : [ "obj-33", 0 ] } @@ -1105,7 +1269,7 @@ "destination" : [ "obj-4", 0 ], "disabled" : 0, "hidden" : 0, - "midpoints" : [ 39.5, 731.5, 25.5, 731.5 ], + "midpoints" : [ 39.5, 795.5, 25.5, 795.5 ], "source" : [ "obj-34", 0 ] } @@ -1127,6 +1291,16 @@ "source" : [ "obj-36", 0 ] } + } +, { + "patchline" : { + "destination" : [ "obj-13", 0 ], + "disabled" : 0, + "hidden" : 0, + "midpoints" : [ 134.0, 79.0, 122.5, 79.0, 122.5, 51.0, 71.0, 51.0 ], + "source" : [ "obj-37", 0 ] + } + } , { "patchline" : { @@ -1148,7 +1322,7 @@ } , { "patchline" : { - "destination" : [ "obj-34", 1 ], + "destination" : [ "obj-12", 0 ], "disabled" : 0, "hidden" : 0, "source" : [ "obj-42", 0 ] @@ -1157,22 +1331,40 @@ } , { "patchline" : { - "destination" : [ "obj-21", 0 ], + "destination" : [ "obj-46", 0 ], "disabled" : 0, "hidden" : 0, - "midpoints" : [ 92.5, 274.0, 361.25, 274.0, 361.25, 58.0, 51.5, 58.0 ], "source" : [ "obj-43", 0 ] } } , { "patchline" : { - "destination" : [ "obj-43", 1 ], + "destination" : [ "obj-7", 0 ], "disabled" : 0, "hidden" : 0, "source" : [ "obj-44", 0 ] } + } +, { + "patchline" : { + "destination" : [ "obj-21", 0 ], + "disabled" : 0, + "hidden" : 0, + "midpoints" : [ 98.5, 335.0, 392.25, 335.0, 392.25, 93.0, 51.5, 93.0 ], + "source" : [ "obj-46", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-27", 0 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-47", 0 ] + } + } , { "patchline" : { @@ -1185,7 +1377,7 @@ } , { "patchline" : { - "destination" : [ "obj-32", 1 ], + "destination" : [ "obj-9", 0 ], "disabled" : 0, "hidden" : 0, "source" : [ "obj-5", 0 ] @@ -1221,7 +1413,7 @@ } , { "patchline" : { - "destination" : [ "obj-33", 1 ], + "destination" : [ "obj-8", 0 ], "disabled" : 0, "hidden" : 0, "source" : [ "obj-6", 0 ] @@ -1245,6 +1437,33 @@ "source" : [ "obj-62", 0 ] } + } +, { + "patchline" : { + "destination" : [ "obj-43", 1 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-7", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-33", 1 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-8", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-32", 1 ], + "disabled" : 0, + "hidden" : 0, + "source" : [ "obj-9", 0 ] + } + } ] } @@ -1496,9 +1715,9 @@ } ], "parameters" : { - "obj-8::obj-32" : [ "[8]", "[2]", 0 ], + "obj-8::obj-35" : [ "[5]", "Level", 0 ], "obj-8::obj-21::obj-6" : [ "live.tab[3]", "live.tab[1]", 0 ], - "obj-8::obj-35" : [ "[5]", "Level", 0 ] + "obj-8::obj-32" : [ "[8]", "[2]", 0 ] } , "dependency_cache" : [ { diff --git a/plugins/pitchotto/DistrhoPluginInfo.h b/plugins/pitchotto/DistrhoPluginInfo.h index 240bcce..df70532 100644 --- a/plugins/pitchotto/DistrhoPluginInfo.h +++ b/plugins/pitchotto/DistrhoPluginInfo.h @@ -1,6 +1,5 @@ /* - * DPF Max Gen - * Copyright (C) 2015 Filipe Coelho + * Copyright (C) 2015 Nino de Wit * * Permission to use, copy, modify, and/or distribute this software for any purpose with * or without fee is hereby granted, provided that the above copyright notice and this @@ -17,7 +16,7 @@ #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED #define DISTRHO_PLUGIN_INFO_H_INCLUDED -#define DISTRHO_PLUGIN_BRAND "Shiro" +#define DISTRHO_PLUGIN_BRAND "SHIRO" #define DISTRHO_PLUGIN_NAME "Pitchotto" #define DISTRHO_PLUGIN_URI "http://distrho.sf.net/plugins/Pitchotto" diff --git a/plugins/shiroverb/DistrhoPluginInfo.h b/plugins/shiroverb/DistrhoPluginInfo.h index bc13dc5..9882a8f 100644 --- a/plugins/shiroverb/DistrhoPluginInfo.h +++ b/plugins/shiroverb/DistrhoPluginInfo.h @@ -1,6 +1,5 @@ /* - * DPF Max Gen - * Copyright (C) 2015 Filipe Coelho + * Copyright (C) 2015 Nino de Wit * * Permission to use, copy, modify, and/or distribute this software for any purpose with * or without fee is hereby granted, provided that the above copyright notice and this @@ -17,7 +16,7 @@ #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED #define DISTRHO_PLUGIN_INFO_H_INCLUDED -#define DISTRHO_PLUGIN_BRAND "Shiro" +#define DISTRHO_PLUGIN_BRAND "SHIRO" #define DISTRHO_PLUGIN_NAME "Shiroverb" #define DISTRHO_PLUGIN_URI "http://distrho.sf.net/plugins/Shiroverb"