diff --git a/mercury_ide/data/initials.json b/mercury_ide/data/initials.json index 18545a38..eab4c066 100644 --- a/mercury_ide/data/initials.json +++ b/mercury_ide/data/initials.json @@ -84,6 +84,7 @@ "beat" : 1, "time" : "1/16", "name" : "null", + "emit" : 1, "group" : "no_group", "sendOSC" : 1, "clock" : 0 diff --git a/mercury_ide/patchers/_mercury_main.maxpat b/mercury_ide/patchers/_mercury_main.maxpat index a52022fb..841852da 100644 --- a/mercury_ide/patchers/_mercury_main.maxpat +++ b/mercury_ide/patchers/_mercury_main.maxpat @@ -45095,6 +45095,8 @@ "saved_object_attributes" : { "autostart" : 1, "defer" : 0, + "node_bin_path" : "", + "npm_bin_path" : "", "watch" : 1 } , @@ -48390,7 +48392,7 @@ , { "box" : { "id" : "obj-284", - "items" : [ "AU DLS Synth 1", ",", "IAC-besturingsbestand Bus 1", ",", "from Max 1", ",", "from Max 2" ], + "items" : [ "AU DLS Synth 1", ",", "IAC-besturingsbestand Bus 1", ",", "Liquid56 MIDI", ",", "from Max 1", ",", "from Max 2" ], "maxclass" : "umenu", "numinlets" : 1, "numoutlets" : 3, @@ -51896,8 +51898,6 @@ "saved_object_attributes" : { "autostart" : 0, "defer" : 1, - "node_bin_path" : "", - "npm_bin_path" : "", "watch" : 1 } , diff --git a/mercury_ide/patchers/soundObject.maxpat b/mercury_ide/patchers/soundObject.maxpat index c49a5d64..94aa7a58 100644 --- a/mercury_ide/patchers/soundObject.maxpat +++ b/mercury_ide/patchers/soundObject.maxpat @@ -203,7 +203,7 @@ , { "box" : { "id" : "obj-14", - "linecount" : 2, + "linecount" : 3, "maxclass" : "newobj", "numinlets" : 0, "numoutlets" : 1, @@ -4213,8 +4213,7 @@ } } - ], - "autosave" : 0 + ] } , "patching_rect" : [ 45.0, 390.0, 105.0, 22.0 ], @@ -10246,7 +10245,6 @@ } ], - "autosave" : 0, "editing_bgcolor" : [ 0.9, 0.9, 0.9, 1.0 ] } , @@ -13869,8 +13867,7 @@ } } - ], - "autosave" : 0 + ] } , "patching_rect" : [ 216.0, 465.0, 78.0, 22.0 ], @@ -14322,8 +14319,7 @@ } } - ], - "autosave" : 0 + ] } , "patching_rect" : [ 216.0, 510.0, 197.5, 22.0 ], @@ -15672,8 +15668,7 @@ } } - ], - "autosave" : 0 + ] } , "patching_rect" : [ 45.5, 285.0, 148.0, 22.0 ], @@ -16039,8 +16034,7 @@ } } - ], - "autosave" : 0 + ] } , "patching_rect" : [ 45.0, 225.0, 129.0, 22.0 ], @@ -16302,7 +16296,7 @@ } , "classnamespace" : "box", - "rect" : [ 754.0, 79.0, 652.0, 783.0 ], + "rect" : [ 34.0, 79.0, 652.0, 783.0 ], "bglocked" : 0, "openinpresentation" : 0, "default_fontsize" : 12.0, @@ -16330,6 +16324,244 @@ "style" : "", "subpatcher_template" : "", "boxes" : [ { + "box" : { + "id" : "obj-26", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 2, + "outlettype" : [ "int", "int" ], + "patching_rect" : [ 463.0, 138.0, 29.5, 22.0 ], + "text" : "t i i" + } + + } +, { + "box" : { + "id" : "obj-25", + "maxclass" : "newobj", + "numinlets" : 2, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 450.0, 180.0, 32.0, 22.0 ], + "text" : "gate" + } + + } +, { + "box" : { + "id" : "obj-21", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "int" ], + "patcher" : { + "fileversion" : 1, + "appversion" : { + "major" : 8, + "minor" : 0, + "revision" : 8, + "architecture" : "x64", + "modernui" : 1 + } +, + "classnamespace" : "box", + "rect" : [ 84.0, 128.0, 640.0, 480.0 ], + "bglocked" : 0, + "openinpresentation" : 0, + "default_fontsize" : 12.0, + "default_fontface" : 0, + "default_fontname" : "Arial", + "gridonopen" : 1, + "gridsize" : [ 15.0, 15.0 ], + "gridsnaponopen" : 1, + "objectsnaponopen" : 1, + "statusbarvisible" : 2, + "toolbarvisible" : 1, + "lefttoolbarpinned" : 0, + "toptoolbarpinned" : 0, + "righttoolbarpinned" : 0, + "bottomtoolbarpinned" : 0, + "toolbars_unpinned_last_save" : 0, + "tallnewobj" : 0, + "boxanimatetime" : 200, + "enablehscroll" : 1, + "enablevscroll" : 1, + "devicewidth" : 0.0, + "description" : "", + "digest" : "", + "tags" : "", + "style" : "", + "subpatcher_template" : "", + "boxes" : [ { + "box" : { + "id" : "obj-26", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "int" ], + "patching_rect" : [ 80.0, 130.0, 22.0, 22.0 ], + "text" : "t 0" + } + + } +, { + "box" : { + "id" : "obj-25", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "int" ], + "patching_rect" : [ 50.0, 130.0, 22.0, 22.0 ], + "text" : "t 1" + } + + } +, { + "box" : { + "id" : "obj-24", + "maxclass" : "newobj", + "numinlets" : 1, + "numoutlets" : 1, + "outlettype" : [ "int" ], + "patching_rect" : [ 50.0, 175.0, 19.0, 22.0 ], + "text" : "t i" + } + + } +, { + "box" : { + "id" : "obj-23", + "maxclass" : "newobj", + "numinlets" : 2, + "numoutlets" : 1, + "outlettype" : [ "int" ], + "patching_rect" : [ 110.0, 130.0, 29.5, 22.0 ], + "text" : "> 0." + } + + } +, { + "box" : { + "id" : "obj-22", + "maxclass" : "newobj", + "numinlets" : 3, + "numoutlets" : 3, + "outlettype" : [ "bang", "bang", "" ], + "patching_rect" : [ 50.0, 100.0, 79.0, 22.0 ], + "text" : "sel on off" + } + + } +, { + "box" : { + "comment" : "", + "id" : "obj-14", + "index" : 1, + "maxclass" : "inlet", + "numinlets" : 0, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 50.0, 40.0, 30.0, 30.0 ] + } + + } +, { + "box" : { + "comment" : "", + "id" : "obj-21", + "index" : 1, + "maxclass" : "outlet", + "numinlets" : 1, + "numoutlets" : 0, + "patching_rect" : [ 50.0, 257.0, 30.0, 30.0 ] + } + + } + ], + "lines" : [ { + "patchline" : { + "destination" : [ "obj-22", 0 ], + "source" : [ "obj-14", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-23", 0 ], + "source" : [ "obj-22", 2 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-25", 0 ], + "source" : [ "obj-22", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-26", 0 ], + "source" : [ "obj-22", 1 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-24", 0 ], + "source" : [ "obj-23", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-21", 0 ], + "source" : [ "obj-24", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-24", 0 ], + "source" : [ "obj-25", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-24", 0 ], + "source" : [ "obj-26", 0 ] + } + + } + ] + } +, + "patching_rect" : [ 278.571428571428555, 270.0, 49.0, 22.0 ], + "saved_object_attributes" : { + "description" : "", + "digest" : "", + "globalpatchername" : "", + "tags" : "" + } +, + "text" : "p on-off" + } + + } +, { + "box" : { + "id" : "obj-12", + "maxclass" : "newobj", + "numinlets" : 2, + "numoutlets" : 1, + "outlettype" : [ "" ], + "patching_rect" : [ 278.571428571428555, 232.0, 84.0, 22.0 ], + "text" : "argListLookup" + } + + } +, { "box" : { "id" : "obj-22", "maxclass" : "newobj", @@ -16632,7 +16864,7 @@ ] } , - "patching_rect" : [ 412.0, 345.0, 89.0, 22.0 ], + "patching_rect" : [ 412.0, 369.0, 89.0, 22.0 ], "saved_object_attributes" : { "description" : "", "digest" : "", @@ -16686,7 +16918,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 450.0, 127.0, 32.0, 22.0 ], + "patching_rect" : [ 463.0, 105.0, 32.0, 22.0 ], "text" : "gate" } @@ -16829,7 +17061,7 @@ "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 493.0, 127.0, 75.0, 33.0 ], + "patching_rect" : [ 506.0, 127.0, 75.0, 33.0 ], "text" : "empty coll contents" } @@ -16841,7 +17073,7 @@ "numinlets" : 1, "numoutlets" : 2, "outlettype" : [ "", "" ], - "patching_rect" : [ 412.0, 285.0, 29.5, 22.0 ], + "patching_rect" : [ 412.0, 309.0, 29.5, 22.0 ], "text" : "t l l" } @@ -16853,7 +17085,7 @@ "numinlets" : 2, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 510.0, 315.0, 29.5, 22.0 ], + "patching_rect" : [ 510.0, 339.0, 29.5, 22.0 ], "text" : "$1" } @@ -16865,7 +17097,7 @@ "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 176.0, 350.0, 76.0, 47.0 ], + "patching_rect" : [ 215.0, 384.0, 76.0, 47.0 ], "text" : "use the regular note method" } @@ -16888,7 +17120,7 @@ "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 510.0, 484.0, 69.0, 47.0 ], + "patching_rect" : [ 510.0, 508.0, 69.0, 47.0 ], "text" : "prepend function() tag" } @@ -16900,7 +17132,7 @@ "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 533.0, 195.0, 69.0, 60.0 ], + "patching_rect" : [ 540.0, 232.0, 69.0, 60.0 ], "text" : "store all name and arguments in coll" } @@ -16936,7 +17168,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 510.0, 375.0, 72.0, 22.0 ], + "patching_rect" : [ 510.0, 399.0, 72.0, 22.0 ], "text" : "prepend set" } @@ -16948,7 +17180,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 510.0, 345.0, 65.0, 22.0 ], + "patching_rect" : [ 510.0, 369.0, 65.0, 22.0 ], "text" : "sprintf /%s" } @@ -16960,7 +17192,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 510.0, 435.0, 53.0, 22.0 ], + "patching_rect" : [ 510.0, 459.0, 53.0, 22.0 ], "text" : "prepend" } @@ -16972,7 +17204,7 @@ "numinlets" : 1, "numoutlets" : 2, "outlettype" : [ "dump", "int" ], - "patching_rect" : [ 450.0, 165.0, 51.0, 22.0 ], + "patching_rect" : [ 450.0, 210.0, 51.0, 22.0 ], "text" : "t dump i" } @@ -16984,7 +17216,7 @@ "numinlets" : 0, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 463.0, 37.0, 105.0, 22.0 ], + "patching_rect" : [ 476.0, 37.0, 105.0, 22.0 ], "text" : "r #0_noteCount" } @@ -16994,11 +17226,11 @@ "id" : "obj-36", "linecount" : 2, "maxclass" : "newobj", - "numinlets" : 7, - "numoutlets" : 7, - "outlettype" : [ "", "", "", "", "", "", "" ], - "patching_rect" : [ 204.5, 127.0, 134.0, 35.0 ], - "text" : "route group beat time sendOSC set clock" + "numinlets" : 8, + "numoutlets" : 8, + "outlettype" : [ "", "", "", "", "", "", "", "" ], + "patching_rect" : [ 174.0, 127.0, 141.0, 35.0 ], + "text" : "route group beat time sendOSC set clock emit" } } @@ -17009,7 +17241,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 243.5, 172.0, 95.0, 22.0 ], + "patching_rect" : [ 296.0, 172.0, 95.0, 22.0 ], "text" : "prepend insert 0" } @@ -17046,7 +17278,7 @@ "numinlets" : 1, "numoutlets" : 4, "outlettype" : [ "", "", "", "" ], - "patching_rect" : [ 390.0, 233.0, 139.0, 35.0 ], + "patching_rect" : [ 390.0, 257.0, 139.0, 35.0 ], "saved_object_attributes" : { "embed" : 0 } @@ -17158,7 +17390,7 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 165.0, 401.0, 83.0, 22.0 ], + "patching_rect" : [ 204.0, 435.0, 83.0, 22.0 ], "text" : "prepend /note" } @@ -17208,6 +17440,13 @@ "source" : [ "obj-11", 0 ] } + } +, { + "patchline" : { + "destination" : [ "obj-21", 0 ], + "source" : [ "obj-12", 0 ] + } + } , { "patchline" : { @@ -17218,7 +17457,7 @@ } , { "patchline" : { - "destination" : [ "obj-38", 0 ], + "destination" : [ "obj-26", 0 ], "source" : [ "obj-14", 0 ] } @@ -17280,6 +17519,14 @@ "source" : [ "obj-19", 0 ] } + } +, { + "patchline" : { + "destination" : [ "obj-25", 0 ], + "midpoints" : [ 288.071428571428555, 302.0, 269.785714285714278, 302.0, 269.785714285714278, 166.0, 459.5, 166.0 ], + "source" : [ "obj-21", 0 ] + } + } , { "patchline" : { @@ -17294,6 +17541,27 @@ "source" : [ "obj-23", 0 ] } + } +, { + "patchline" : { + "destination" : [ "obj-38", 0 ], + "source" : [ "obj-25", 0 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-12", 1 ], + "source" : [ "obj-26", 1 ] + } + + } +, { + "patchline" : { + "destination" : [ "obj-25", 1 ], + "source" : [ "obj-26", 0 ] + } + } , { "patchline" : { @@ -17325,10 +17593,17 @@ } , { "patchline" : { - "destination" : [ "obj-35", 0 ], + "destination" : [ "obj-12", 0 ], "source" : [ "obj-36", 6 ] } + } +, { + "patchline" : { + "destination" : [ "obj-35", 0 ], + "source" : [ "obj-36", 7 ] + } + } , { "patchline" : { @@ -18662,7 +18937,7 @@ "maxclass" : "newobj", "numinlets" : 1, "numoutlets" : 2, - "outlettype" : [ "2645_", "" ], + "outlettype" : [ "3276_", "" ], "patching_rect" : [ 237.499985000000038, 480.0, 71.0, 22.0 ], "text" : "t #0_ l" } @@ -21161,7 +21436,6 @@ } ], - "autosave" : 0, "editing_bgcolor" : [ 0.9, 0.9, 0.9, 1.0 ] } , @@ -21304,7 +21578,6 @@ } ], - "autosave" : 0, "editing_bgcolor" : [ 0.9, 0.9, 0.9, 1.0 ] } , @@ -22807,8 +23080,7 @@ } } - ], - "autosave" : 0 + ] } , "patching_rect" : [ 650.999920999999858, 490.0, 77.0, 22.0 ], @@ -23475,7 +23747,6 @@ } ], - "autosave" : 0, "editing_bgcolor" : [ 0.9, 0.9, 0.9, 1.0 ] } , @@ -29716,8 +29987,7 @@ } } - ], - "autosave" : 0 + ] } , "patching_rect" : [ 50.0, 405.0, 95.0, 22.0 ], @@ -31823,7 +32093,6 @@ } ], - "autosave" : 0, "editing_bgcolor" : [ 0.9, 0.9, 0.9, 1.0 ] } , @@ -33233,8 +33502,7 @@ } } - ], - "autosave" : 0 + ] } , "patching_rect" : [ 133.0, 495.0, 106.0, 22.0 ], @@ -34248,8 +34516,7 @@ } } - ], - "autosave" : 0 + ] } , "patching_rect" : [ 398.0, 855.0, 110.0, 22.0 ], @@ -37520,8 +37787,7 @@ } } - ], - "autosave" : 0 + ] } , "patching_rect" : [ 343.0, 707.0, 109.0, 22.0 ], @@ -41209,10 +41475,6 @@ "numinlets" : 1, "numoutlets" : 0, "patching_rect" : [ 201.5, 1860.0, 44.0, 22.0 ], - "saved_object_attributes" : { - "attr_comment" : "" - } -, "text" : "out~ 2" } @@ -41224,10 +41486,6 @@ "numinlets" : 1, "numoutlets" : 0, "patching_rect" : [ 148.666672000000005, 1860.0, 44.0, 22.0 ], - "saved_object_attributes" : { - "attr_comment" : "" - } -, "text" : "out~ 1" } @@ -41240,10 +41498,6 @@ "numoutlets" : 1, "outlettype" : [ "" ], "patching_rect" : [ 169.666672000000005, 30.0, 30.0, 22.0 ], - "saved_object_attributes" : { - "attr_comment" : "" - } -, "text" : "in 1" }