/gain is now calculated internally rather than being specified as a range

diff --git a/engine_voice.episodes~.maxpat b/engine_voice.episodes~.maxpat
index 8955448e4823b4b021b09f7eb193d2291571a394..50952650fa29f045f45d6bf341afdb94d9a6c515 100644 (file)
--- a/engine_voice.episodes~.maxpat
+++ b/engine_voice.episodes~.maxpat
@@ -324,6 +324,10 @@
                                        "numinlets" : 1,
                                        "numoutlets" : 0,
                                        "patching_rect" : [ 756.0, 1016.0, 42.0, 22.0 ],
+                                       "saved_object_attributes" :                                     {
+                                               "attr_comment" : ""
+                                       }
+,
                                        "text" : "out~ 2"
                                }
 
@@ -481,6 +485,10 @@
                                        "numinlets" : 1,
                                        "numoutlets" : 0,
                                        "patching_rect" : [ 1258.0, 1019.0, 35.0, 22.0 ],
+                                       "saved_object_attributes" :                                     {
+                                               "attr_comment" : ""
+                                       }
+,
                                        "text" : "out 1"
                                }
 
@@ -668,10 +676,6 @@
                                        "numinlets" : 1,
                                        "numoutlets" : 0,
                                        "patching_rect" : [ 581.0, 1016.0, 52.0, 22.0 ],
-                                       "saved_object_attributes" :                                     {
-                                               "attr_comment" : ""
-                                       }
-,
                                        "text" : "out~ 1"
                                }
 
@@ -684,10 +688,6 @@
                                        "numoutlets" : 1,
                                        "outlettype" : [ "" ],
                                        "patching_rect" : [ 355.0, 39.0, 38.0, 22.0 ],
-                                       "saved_object_attributes" :                                     {
-                                               "attr_comment" : ""
-                                       }
-,
                                        "text" : "in 1"
                                }
 
@@ -1007,20 +1007,21 @@
                                                                                }
 ,
                                                                                "classnamespace" : "box",
-                                                                               "rect" : [ 59.0, 106.0, 1000.0, 780.0 ],
+                                                                               "rect" : [ 59.0, 106.0, 700.0, 483.0 ],
                                                                                "gridsize" : [ 15.0, 15.0 ],
                                                                                "subpatcher_template" : "Untitled5_template",
                                                                                "boxes" : [                                                                                     {
                                                                                                "box" :                                                                                                 {
                                                                                                        "fontface" : 0,
                                                                                                        "id" : "obj-27",
-                                                                                                       "linecount" : 14,
+                                                                                                       "linecount" : 13,
                                                                                                        "maxclass" : "o.expr.codebox",
                                                                                                        "numinlets" : 1,
                                                                                                        "numoutlets" : 2,
                                                                                                        "outlettype" : [ "FullPacket", "FullPacket" ],
-                                                                                                       "patching_rect" : [ 50.0, 100.0, 560.0, 198.0 ],
-                                                                                                       "text" : "/segment ??= [0., 1.], \n/gain/range ??= [0.8, 1.2],\n/speed ??= 1.,\n/trajspeed/range ??= [20, 50],\n/spacing/range *= 1000.,\n/fade/out = 6. * 1000.,\n\n/gain = scale(/r/gain, 0., 1., /gain/range[[0]], /gain/range[[1]]), \n/tspeed = scale(/r/tspeed, 0., 1., /trajspeed/range[[0]], /trajspeed/range[[1]]),\n/area = /segment * /buffer/len,\n/dur = abs(/area[[0]] - /area[[1]]) * (1. / /speed),\n/line = [/area[[0]], 0, /area[[1]], /dur], \n/sdelay = scale(/r/space, 0., 1., /spacing/range[[0]], /spacing/range[[1]]), \n/duroff = /dur - /fade/out"
+                                                                                                       "patching_rect" : [ 50.0, 100.0, 560.0, 185.0 ],
+                                                                                                       "presentation_linecount" : 13,
+                                                                                                       "text" : "/segment ??= [0., 1.], \n/speed ??= 1.,\n/trajspeed/range ??= [20, 50],\n/spacing/range *= 1000.,\n/fade/out = 6. * 1000.,\n\n/gain = scale(/r/gain, 0., 1., -0.8, 1.2), \n/tspeed = scale(/r/tspeed, 0., 1., /trajspeed/range[[0]], /trajspeed/range[[1]]),\n/area = /segment * /buffer/len,\n/dur = abs(/area[[0]] - /area[[1]]) * (1. / /speed),\n/line = [/area[[0]], 0, /area[[1]], /dur], \n/sdelay = scale(/r/space, 0., 1., /spacing/range[[0]], /spacing/range[[1]]), \n/duroff = /dur - /fade/out"
                                                                                                }
 
                                                                                        }
@@ -1045,7 +1046,7 @@
                                                                                                        "maxclass" : "outlet",
                                                                                                        "numinlets" : 1,
                                                                                                        "numoutlets" : 0,
-                                                                                                       "patching_rect" : [ 50.0, 511.0, 30.0, 30.0 ]
+                                                                                                       "patching_rect" : [ 50.0, 312.0, 30.0, 30.0 ]
                                                                                                }
 
                                                                                        }

diff --git a/engine_voice.fragments~.maxpat b/engine_voice.fragments~.maxpat
index 691da020111aaef1b81f9c9b5343bcfc5844e96c..4923626eadb03594bfa8485687a079f57b58cea1 100644 (file)
--- a/engine_voice.fragments~.maxpat
+++ b/engine_voice.fragments~.maxpat
@@ -252,6 +252,10 @@
                                        "numinlets" : 1,
                                        "numoutlets" : 0,
                                        "patching_rect" : [ 559.0, 844.0, 42.0, 22.0 ],
+                                       "saved_object_attributes" :                                     {
+                                               "attr_comment" : ""
+                                       }
+,
                                        "text" : "out~ 2"
                                }
 
@@ -574,10 +578,6 @@
                                        "numinlets" : 1,
                                        "numoutlets" : 0,
                                        "patching_rect" : [ 1037.0, 757.0, 35.0, 22.0 ],
-                                       "saved_object_attributes" :                                     {
-                                               "attr_comment" : ""
-                                       }
-,
                                        "text" : "out 1"
                                }
 
@@ -765,6 +765,10 @@
                                        "numinlets" : 1,
                                        "numoutlets" : 0,
                                        "patching_rect" : [ 405.0, 844.0, 52.0, 22.0 ],
+                                       "saved_object_attributes" :                                     {
+                                               "attr_comment" : ""
+                                       }
+,
                                        "text" : "out~ 1"
                                }
 
@@ -777,6 +781,10 @@
                                        "numoutlets" : 1,
                                        "outlettype" : [ "" ],
                                        "patching_rect" : [ 332.0, 22.0, 38.0, 22.0 ],
+                                       "saved_object_attributes" :                                     {
+                                               "attr_comment" : ""
+                                       }
+,
                                        "text" : "in 1"
                                }
 
@@ -1146,13 +1154,13 @@
                                                                                                                                "box" :                                                                                                                                 {
                                                                                                                                        "fontface" : 0,
                                                                                                                                        "id" : "obj-1",
-                                                                                                                                       "linecount" : 11,
+                                                                                                                                       "linecount" : 10,
                                                                                                                                        "maxclass" : "o.expr.codebox",
                                                                                                                                        "numinlets" : 1,
                                                                                                                                        "numoutlets" : 2,
                                                                                                                                        "outlettype" : [ "FullPacket", "FullPacket" ],
-                                                                                                                                       "patching_rect" : [ 50.0, 100.0, 547.0, 159.0 ],
-                                                                                                                                       "text" : "/segment ??= [0., 1.], \n/spacing/range ??= [0., 0.],\n/gain/range ??= [0.8, 1.2],\n/trajspeed/range ??= [20, 50],\n/speed ??= 1.,\n/gain = scale(/r/gain, 0., 1., /gain/range[[0]], /gain/range[[1]]), \n/tspeed = scale(/r/tspeed, 0., 1., /trajspeed/range[[0]], /trajspeed/range[[1]]),\n/spacing/range *= 1000.,\n/area = /segment * /buffer/len,\n/dur = abs(/area[[0]] - /area[[1]]) * (1. / /speed),\n/line = [/area[[0]], 0, /area[[1]], /dur]"
+                                                                                                                                       "patching_rect" : [ 50.0, 100.0, 547.0, 147.0 ],
+                                                                                                                                       "text" : "/segment ??= [0., 1.], \n/spacing/range ??= [0., 0.],\n/trajspeed/range ??= [20, 50],\n/speed ??= 1.,\n/gain = scale(/r/gain, 0., 1., 0.8, 1.2), \n/tspeed = scale(/r/tspeed, 0., 1., /trajspeed/range[[0]], /trajspeed/range[[1]]),\n/spacing/range *= 1000.,\n/area = /segment * /buffer/len,\n/dur = abs(/area[[0]] - /area[[1]]) * (1. / /speed),\n/line = [/area[[0]], 0, /area[[1]], /dur]"
                                                                                                                                }
 
                                                                                                                        }

diff --git a/engine_voice.stretch~.maxpat b/engine_voice.stretch~.maxpat
index 262de8d259d9be58cea0a47f4aefdc334761bc58..f7eaddc1bd3025ef246d108fbab98a07ae3a75a3 100644 (file)
--- a/engine_voice.stretch~.maxpat
+++ b/engine_voice.stretch~.maxpat
@@ -770,13 +770,13 @@
                                                                "box" :                                                                 {
                                                                        "fontface" : 0,
                                                                        "id" : "obj-60",
-                                                                       "linecount" : 9,
+                                                                       "linecount" : 8,
                                                                        "maxclass" : "o.expr.codebox",
                                                                        "numinlets" : 1,
                                                                        "numoutlets" : 2,
                                                                        "outlettype" : [ "FullPacket", "FullPacket" ],
-                                                                       "patching_rect" : [ 126.0, 336.0, 474.0, 134.0 ],
-                                                                       "text" : "/gain/range ??= [0.8, 1.2],\n/gainval = scale(/r/gain, 0., 1., /gain/range[[0]], /gain/range[[1]]),\n/margin = 5000,\n/line/dest = /buffer/len - /margin,\n/line/dur = /stretch/factor * /buffer/len,\n/linemsg = [0, 0, /line/dest, /line/dur],\nif(/buffer/len < /margin, \n  /error = \"too short\"\n)"
+                                                                       "patching_rect" : [ 126.0, 336.0, 474.0, 121.0 ],
+                                                                       "text" : "/gainval = scale(/r/gain, 0., 1., 0.8, 1.2),\n/margin = 5000,\n/line/dest = /buffer/len - /margin,\n/line/dur = /stretch/factor * /buffer/len,\n/linemsg = [0, 0, /line/dest, /line/dur],\nif(/buffer/len < /margin, \n  /error = \"too short\"\n)"
                                                                }
 
                                                        }
@@ -1667,10 +1667,6 @@
                                        "numinlets" : 1,
                                        "numoutlets" : 0,
                                        "patching_rect" : [ 566.0, 794.0, 42.0, 22.0 ],
-                                       "saved_object_attributes" :                                     {
-                                               "attr_comment" : ""
-                                       }
-,
                                        "text" : "out~ 2"
                                }
 
@@ -1963,6 +1959,10 @@
                                        "numinlets" : 1,
                                        "numoutlets" : 0,
                                        "patching_rect" : [ 874.0, 799.0, 35.0, 22.0 ],
+                                       "saved_object_attributes" :                                     {
+                                               "attr_comment" : ""
+                                       }
+,
                                        "text" : "out 1"
                                }
 
@@ -2138,10 +2138,6 @@
                                        "numinlets" : 1,
                                        "numoutlets" : 0,
                                        "patching_rect" : [ 431.0, 799.0, 52.0, 22.0 ],
-                                       "saved_object_attributes" :                                     {
-                                               "attr_comment" : ""
-                                       }
-,
                                        "text" : "out~ 1"
                                }
 
@@ -2154,10 +2150,6 @@
                                        "numoutlets" : 1,
                                        "outlettype" : [ "" ],
                                        "patching_rect" : [ 330.0, 56.0, 38.0, 22.0 ],
-                                       "saved_object_attributes" :                                     {
-                                               "attr_comment" : ""
-                                       }
-,
                                        "text" : "in 1"
                                }