1 files changed, 32 insertions, 34 deletions

diff --git a/modules/ramp.c b/modules/ramp.c
index ad13582..526ec4e 100644
--- a/modules/ramp.c
+++ b/modules/ramp.c
@@ -24,64 +24,53 @@
 
 typedef struct rampctl
 {
-  t_float c_offset;
-  t_float c_looppoint;
+    t_float c_offset;
+    t_int c_blockscale;
 } t_rampctl;
 
 typedef struct ramp
 {
-  t_object x_obj;
-  t_float x_f;
-  t_rampctl x_ctl;
+    t_object x_obj;
+    t_float x_f;
+    t_rampctl x_ctl;
 } t_ramp;
 
 
 void ramp_offset(t_ramp *x,  t_floatarg f)
 {
-
-  x->x_ctl.c_offset = f;
-
-}
-
-void ramp_looppoint(t_ramp *x,  t_floatarg f)
-{
-
-  x->x_ctl.c_looppoint = f;
-
+    x->x_ctl.c_offset = f;
 }
 
 
 void ramp_bang(t_ramp *x)
 {
-  ramp_offset(x, 0);
-
+    ramp_offset(x, 0);
 }
 
 
 
 static t_int *ramp_perform(t_int *w)
 {
+    t_float *out    = (float *)(w[3]);
+    t_rampctl *ctl  = (t_rampctl *)(w[1]);
+    t_int i;
+    t_int n = (t_int)(w[2]);
+    t_float x;
 
-
-  t_float *out    = (float *)(w[3]);
-  t_rampctl *ctl  = (t_rampctl *)(w[1]);
-  t_int i;
-  t_int n = (t_int)(w[2]);
-  t_float x;
-
+    t_float scale = ctl->c_blockscale ? 1.0f / (float)n : 1.0f;
 
 
-  x = ctl->c_offset;
-
-  for (i = 0; i < n; i++)
-    {
-      *out++ = (float)x++;
-    }
+    x = ctl->c_offset;
+    
+    for (i = 0; i < n; i++)
+	{
+	    *out++ = ((float)x++) * scale;
+	}
 
-  ctl->c_offset = x; /* save state */
+    ctl->c_offset = x; /* save state */
 
     
-  return (w+4);
+    return (w+4);
 }
 
 static void ramp_dsp(t_ramp *x, t_signal **sp)
@@ -99,18 +88,27 @@ t_class *ramp_class;
 void *ramp_new(void)
 {
     t_ramp *x = (t_ramp *)pd_new(ramp_class);
-    /*  inlet_new(&x->x_obj, &x->x_obj.ob_pd, gensym("float"), gensym("looppoint"));*/
     outlet_new(&x->x_obj, gensym("signal")); 
-
+    x->x_ctl.c_blockscale = 0;
     ramp_bang(x);
     return (void *)x;
 }
 
+void *blockramp_new(void)
+{
+    t_ramp *x = (t_ramp *)ramp_new();
+    x->x_ctl.c_blockscale = 1;
+    return (void *)x;
+}
+
 void ramp_tilde_setup(void)
 {
   //post("ramp~ v0.1");
     ramp_class = class_new(gensym("ramp~"), (t_newmethod)ramp_new,
     	(t_method)ramp_free, sizeof(t_ramp), 0, 0);
+
+    class_addcreator((t_newmethod)blockramp_new, gensym("blockramp~"), A_NULL);
+
     class_addmethod(ramp_class, (t_method)ramp_bang, gensym("bang"), 0);
     class_addmethod(ramp_class, (t_method)ramp_dsp, gensym("dsp"), 0); 
     class_addfloat(ramp_class, (t_method)ramp_offset);