Update dust2~.c

porres · Aug 4, 2023 · b5e2dad · b5e2dad
1 parent fa66142
commit b5e2dad
Showing 1 changed file with 33 additions and 15 deletions.
diff --git a/Code_source/Compiled/signal/dust2~.c b/Code_source/Compiled/signal/dust2~.c
@@ -10,9 +10,10 @@ typedef struct _dust2{
     t_float        x_sample_dur;
     t_random_state x_rstate;
     t_float        x_density;
-    t_float        x_lastout;
+    t_float       *x_lastout;
     int            x_id;
     int            x_nchans;
+    int            x_ch;
 }t_dust2;
 
 static void dust2_seed(t_dust2 *x, t_symbol *s, int ac, t_atom *av){
@@ -27,39 +28,56 @@ static void dust2_ch(t_dust2 *x, t_floatarg f){
 static t_int *dust2_perform(t_int *w){
     t_dust2 *x = (t_dust2 *)(w[1]);
     int n = (t_int)(w[2]);
-    t_float *in1 = (t_float *)(w[3]);
-    t_float *out = (t_sample *)(w[4]);
-    t_float lastout = x->x_lastout;
+    int chs = (t_int)(w[3]);
+    t_float *in1 = (t_float *)(w[4]);
+    t_float *out = (t_sample *)(w[5]);
+    t_float *lastout = x->x_lastout;
     uint32_t *s1 = &x->x_rstate.s1;
     uint32_t *s2 = &x->x_rstate.s2;
     uint32_t *s3 = &x->x_rstate.s3;
-    while(n--){
-        t_float density = *in1++;
-        t_float thresh = density * x->x_sample_dur / x->x_nchans;
+    for(int i = 0; i < n; i++){
+        for(int j = 0; j < x->x_nchans; j++){
+        t_float density = chs == 1 ? in1[i] : in1[j*n + i];
+        t_float thresh = density * x->x_sample_dur;
         t_float scale = thresh > 0 ? 2./thresh : 0;
-        for(int i = 0; i < x->x_nchans; i++){
             t_float random = (t_float)(random_frand(s1, s2, s3) * 0.5 + 0.5);
             t_float output = random < thresh ? (random * scale) - 1 : 0;
-            if(output != 0 && lastout != 0)
+            if(output != 0 && lastout[j] != 0)
                 output = 0;
-            *out++ = lastout = output;
+            out[j*n + i] = lastout[j] = output;
         }
     }
     x->x_lastout = lastout;
-    return(w+5);
+    return(w+6);
 }
 
 static void dust2_dsp(t_dust2 *x, t_signal **sp){
     x->x_sample_dur = 1./sp[0]->s_sr;
+    int chs = sp[0]->s_nchans, n = sp[0]->s_n;
+    if(chs == 1)
+        chs = x->x_ch;
+    signal_setmultiout(&sp[1], chs);
+    if(x->x_nchans != chs){
+        x->x_lastout = (t_float *)resizebytes(x->x_lastout,
+            x->x_nchans * sizeof(t_float), chs * sizeof(t_float));
+        x->x_nchans = chs;
+    }
     signal_setmultiout(&sp[1], x->x_nchans);
-    dsp_add(dust2_perform, 4, x, sp[0]->s_n, sp[0]->s_vec, sp[1]->s_vec);
+    dsp_add(dust2_perform, 5, x, n, sp[0]->s_nchans, sp[0]->s_vec, sp[1]->s_vec);
+}
+
+static void *dust2_free(t_dust2 *x){
+    freebytes(x->x_lastout, x->x_nchans * sizeof(*x->x_lastout));
+    return(void *)x;
 }
 
 static void *dust2_new(t_symbol *s, int ac, t_atom *av){
     t_dust2 *x = (t_dust2 *)pd_new(dust2_class);
     x->x_id = random_get_id();
     x->x_nchans = 1;
     dust2_seed(x, s, 0, NULL);
+    x->x_lastout = (t_float *)getbytes(sizeof(*x->x_lastout));
+    x->x_ch = 1;
     while(av->a_type == A_SYMBOL){
         if(ac >= 2 && atom_getsymbol(av) == gensym("-seed")){
             t_atom at[1];
@@ -69,25 +87,25 @@ static void *dust2_new(t_symbol *s, int ac, t_atom *av){
         }
         else if(ac >= 2 && atom_getsymbol(av) == gensym("-ch")){
             int n = atom_getint(av+1);
-            x->x_nchans = n < 1 ? 1 : n;
+            x->x_ch = n < 1 ? 1 : n;
             ac-=2, av+=2;
         }
         else{
             pd_error(x, "[dust2~]: improper args");
             return(NULL);
         }
     }
-    x->x_lastout = 0;
     x->x_density = ac ? atom_getfloat(av) : 0;
     outlet_new(&x->x_obj, &s_signal);
     return(x);
 }
 
 void dust2_tilde_setup(void){
     dust2_class = class_new(gensym("dust2~"), (t_newmethod)dust2_new,
-        0, sizeof(t_dust2), CLASS_MULTICHANNEL, A_GIMME, 0);
+        (t_method)dust2_free, sizeof(t_dust2), CLASS_MULTICHANNEL, A_GIMME, 0);
     CLASS_MAINSIGNALIN(dust2_class, t_dust2, x_density);
     class_addmethod(dust2_class, (t_method)dust2_dsp, gensym("dsp"), A_CANT, 0);
     class_addmethod(dust2_class, (t_method)dust2_seed, gensym("seed"), A_GIMME, 0);
     class_addmethod(dust2_class, (t_method)dust2_ch, gensym("ch"), A_DEFFLOAT, 0);
 }
+