Skip to content

Commit 2071a87

Browse files
tmhglndtmhglnd
committed
update initials for input instrument
1 parent d704d5d commit 2071a87

7 files changed

Lines changed: 151 additions & 137 deletions

File tree

‎grammar/data/bind-functions.gen.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,5 +189,32 @@
189189
"start": "offset",
190190
"startAt": "offset",
191191
"from": "offset"
192+
},
193+
"input": {
194+
"timing": "time",
195+
"rhythm": "beat",
196+
"play": "beat",
197+
"gain": "amp",
198+
"vol": "amp",
199+
"volume": "amp",
200+
"amplitude": "amp",
201+
"velocity": "amp",
202+
"vel": "amp",
203+
"envelope": "env",
204+
"shape": "env",
205+
"transient": "env",
206+
"length": "env",
207+
"duration": "env",
208+
"dur": "env",
209+
"panning": "pan",
210+
"spat": "pan",
211+
"location": "pan",
212+
"id": "name",
213+
"aux": "group",
214+
"bus": "group",
215+
"withFX": "add_fx",
216+
"addFX": "add_fx",
217+
"effect": "add_fx",
218+
"fx": "add_fx"
192219
}
193220
}

‎grammar/data/instrument-methods.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,16 @@
7878
"group",
7979
"name",
8080
"offset"
81+
],
82+
83+
"input" : [
84+
"time",
85+
"beat",
86+
"amp",
87+
"env",
88+
"pan",
89+
"name",
90+
"group",
91+
"add_fx"
8192
]
8293
}

‎mercury_ide/data/bind-functions.gen.json‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,5 +189,32 @@
189189
"start": "offset",
190190
"startAt": "offset",
191191
"from": "offset"
192+
},
193+
"input": {
194+
"timing": "time",
195+
"rhythm": "beat",
196+
"play": "beat",
197+
"gain": "amp",
198+
"vol": "amp",
199+
"volume": "amp",
200+
"amplitude": "amp",
201+
"velocity": "amp",
202+
"vel": "amp",
203+
"envelope": "env",
204+
"shape": "env",
205+
"transient": "env",
206+
"length": "env",
207+
"duration": "env",
208+
"dur": "env",
209+
"panning": "pan",
210+
"spat": "pan",
211+
"location": "pan",
212+
"id": "name",
213+
"aux": "group",
214+
"bus": "group",
215+
"withFX": "add_fx",
216+
"addFX": "add_fx",
217+
"effect": "add_fx",
218+
"fx": "add_fx"
192219
}
193220
}

‎mercury_ide/patchers/_mercury_main.maxpat‎

Lines changed: 49 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -2828,7 +2828,7 @@
28282828
"numinlets" : 1,
28292829
"numoutlets" : 1,
28302830
"outlettype" : [ "" ],
2831-
"patching_rect" : [ 1224.619506999999885, 1612.5, 125.0, 22.0 ],
2831+
"patching_rect" : [ 1195.619506999999885, 1551.5, 125.0, 22.0 ],
28322832
"text" : "loadmess chromatic c"
28332833
}
28342834

@@ -61053,18 +61053,6 @@
6105361053
"text" : "p modulators-TODO"
6105461054
}
6105561055

61056-
}
61057-
, {
61058-
"box" : {
61059-
"id" : "obj-190",
61060-
"maxclass" : "message",
61061-
"numinlets" : 2,
61062-
"numoutlets" : 1,
61063-
"outlettype" : [ "" ],
61064-
"patching_rect" : [ 1224.619506999999885, 1581.5, 104.0, 22.0 ],
61065-
"text" : "minor_harmonic c"
61066-
}
61067-
6106861056
}
6106961057
, {
6107061058
"box" : {
@@ -61589,18 +61577,6 @@
6158961577
"text" : "p console-code-TODO"
6159061578
}
6159161579

61592-
}
61593-
, {
61594-
"box" : {
61595-
"id" : "obj-422",
61596-
"maxclass" : "message",
61597-
"numinlets" : 2,
61598-
"numoutlets" : 1,
61599-
"outlettype" : [ "" ],
61600-
"patching_rect" : [ 1224.619506999999885, 1551.5, 70.0, 22.0 ],
61601-
"text" : "chromatic c"
61602-
}
61603-
6160461580
}
6160561581
, {
6160661582
"box" : {
@@ -63632,7 +63608,7 @@
6363263608
"numinlets" : 0,
6363363609
"numoutlets" : 1,
6363463610
"outlettype" : [ "" ],
63635-
"patching_rect" : [ 1322.619506999999885, 1414.0, 48.0, 22.0 ],
63611+
"patching_rect" : [ 1213.619506999999885, 1414.0, 48.0, 22.0 ],
6363663612
"text" : "r scalar"
6363763613
}
6363863614

@@ -63644,19 +63620,7 @@
6364463620
"numinlets" : 0,
6364563621
"numoutlets" : 1,
6364663622
"outlettype" : [ "" ],
63647-
"patching_rect" : [ 1252.084777999999915, 1414.0, 58.0, 22.0 ],
63648-
"text" : "r EOFpre"
63649-
}
63650-
63651-
}
63652-
, {
63653-
"box" : {
63654-
"id" : "obj-397",
63655-
"maxclass" : "newobj",
63656-
"numinlets" : 0,
63657-
"numoutlets" : 1,
63658-
"outlettype" : [ "" ],
63659-
"patching_rect" : [ 1143.084777999999915, 1478.5, 58.0, 22.0 ],
63623+
"patching_rect" : [ 1143.084777999999915, 1414.0, 58.0, 22.0 ],
6366063624
"text" : "r EOFpre"
6366163625
}
6366263626

@@ -63668,7 +63632,7 @@
6366863632
"numinlets" : 0,
6366963633
"numoutlets" : 1,
6367063634
"outlettype" : [ "" ],
63671-
"patching_rect" : [ 1162.084777999999915, 1414.0, 44.0, 22.0 ],
63635+
"patching_rect" : [ 1143.084777999999915, 1551.5, 44.0, 22.0 ],
6367263636
"text" : "r scale"
6367363637
}
6367463638

@@ -69856,7 +69820,7 @@
6985669820
"numinlets" : 1,
6985769821
"numoutlets" : 1,
6985869822
"outlettype" : [ "int" ],
69859-
"patching_rect" : [ 1376.619506999999885, 1444.0, 24.0, 22.0 ],
69823+
"patching_rect" : [ 1267.619506999999885, 1444.0, 24.0, 22.0 ],
6986069824
"text" : "t 0"
6986169825
}
6986269826

@@ -69868,7 +69832,7 @@
6986869832
"numinlets" : 0,
6986969833
"numoutlets" : 1,
6987069834
"outlettype" : [ "" ],
69871-
"patching_rect" : [ 1376.619506999999885, 1414.0, 40.0, 22.0 ],
69835+
"patching_rect" : [ 1267.619506999999885, 1414.0, 40.0, 22.0 ],
6987269836
"text" : "r SOF"
6987369837
}
6987469838

@@ -69880,7 +69844,7 @@
6988069844
"numinlets" : 2,
6988169845
"numoutlets" : 1,
6988269846
"outlettype" : [ "int" ],
69883-
"patching_rect" : [ 1304.619506999999885, 1477.5, 37.0, 22.0 ],
69847+
"patching_rect" : [ 1195.619506999999885, 1477.5, 37.0, 22.0 ],
6988469848
"text" : "int"
6988569849
}
6988669850

@@ -69891,7 +69855,7 @@
6989169855
"maxclass" : "newobj",
6989269856
"numinlets" : 1,
6989369857
"numoutlets" : 0,
69894-
"patching_rect" : [ 1304.619506999999885, 1520.5, 69.0, 22.0 ],
69858+
"patching_rect" : [ 1195.619506999999885, 1520.5, 69.0, 22.0 ],
6989569859
"text" : "s theScalar"
6989669860
}
6989769861

@@ -69960,25 +69924,13 @@
6996069924
}
6996169925
, {
6996269926
"box" : {
69963-
"id" : "obj-272",
69927+
"id" : "obj-236",
6996469928
"maxclass" : "newobj",
69965-
"numinlets" : 0,
69929+
"numinlets" : 1,
6996669930
"numoutlets" : 1,
6996769931
"outlettype" : [ "" ],
69968-
"patching_rect" : [ 1224.619506999999885, 1520.5, 40.0, 22.0 ],
69969-
"text" : "r SOF"
69970-
}
69971-
69972-
}
69973-
, {
69974-
"box" : {
69975-
"id" : "obj-236",
69976-
"maxclass" : "newobj",
69977-
"numinlets" : 2,
69978-
"numoutlets" : 2,
69979-
"outlettype" : [ "", "" ],
69980-
"patching_rect" : [ 1143.084777999999915, 1612.5, 38.0, 22.0 ],
69981-
"text" : "zl.reg"
69932+
"patching_rect" : [ 1143.084777999999915, 1612.5, 19.0, 22.0 ],
69933+
"text" : "t l"
6998269934
}
6998369935

6998469936
}
@@ -72199,13 +72151,6 @@
7219972151
"source" : [ "obj-19", 0 ]
7220072152
}
7220172153

72202-
}
72203-
, {
72204-
"patchline" : {
72205-
"destination" : [ "obj-236", 1 ],
72206-
"source" : [ "obj-190", 0 ]
72207-
}
72208-
7220972154
}
7221072155
, {
7221172156
"patchline" : {
@@ -72799,13 +72744,6 @@
7279972744
"source" : [ "obj-270", 0 ]
7280072745
}
7280172746

72802-
}
72803-
, {
72804-
"patchline" : {
72805-
"destination" : [ "obj-422", 0 ],
72806-
"source" : [ "obj-272", 0 ]
72807-
}
72808-
7280972747
}
7281072748
, {
7281172749
"patchline" : {
@@ -73820,7 +73758,7 @@
7382073758
}
7382173759
, {
7382273760
"patchline" : {
73823-
"destination" : [ "obj-236", 1 ],
73761+
"destination" : [ "obj-236", 0 ],
7382473762
"source" : [ "obj-395", 0 ]
7382573763
}
7382673764

@@ -73831,13 +73769,6 @@
7383173769
"source" : [ "obj-396", 0 ]
7383273770
}
7383373771

73834-
}
73835-
, {
73836-
"patchline" : {
73837-
"destination" : [ "obj-236", 0 ],
73838-
"source" : [ "obj-397", 0 ]
73839-
}
73840-
7384173772
}
7384273773
, {
7384373774
"patchline" : {
@@ -74020,7 +73951,7 @@
7402073951
}
7402173952
, {
7402273953
"patchline" : {
74023-
"destination" : [ "obj-236", 1 ],
73954+
"destination" : [ "obj-236", 0 ],
7402473955
"source" : [ "obj-421", 0 ]
7402573956
}
7402673957

@@ -74701,10 +74632,24 @@
7470174632
"type" : "JSON",
7470274633
"implicit" : 1
7470374634
}
74635+
, {
74636+
"name" : "control.maxpat",
74637+
"bootpath" : "~/Documents/Mercury/Library/Sound",
74638+
"patcherrelativepath" : "../../../../../../../../../Documents/Mercury/Library/Sound",
74639+
"type" : "JSON",
74640+
"implicit" : 1
74641+
}
7470474642
, {
7470574643
"name" : "cv.jit.resize.mxo",
7470674644
"type" : "iLaX"
7470774645
}
74646+
, {
74647+
"name" : "cvSine.maxpat",
74648+
"bootpath" : "~/Documents/Mercury/Library/Sound",
74649+
"patcherrelativepath" : "../../../../../../../../../Documents/Mercury/Library/Sound",
74650+
"type" : "JSON",
74651+
"implicit" : 1
74652+
}
7470874653
, {
7470974654
"name" : "divToMs.maxpat",
7471074655
"bootpath" : "~/Drive/work/code/max/major_projects/mercury_lc/mercury/mercury_ide/patchers",
@@ -74845,6 +74790,13 @@
7484574790
"type" : "JSON",
7484674791
"implicit" : 1
7484774792
}
74793+
, {
74794+
"name" : "homeostat.maxpat",
74795+
"bootpath" : "~/Documents/Mercury/Library/Sound",
74796+
"patcherrelativepath" : "../../../../../../../../../Documents/Mercury/Library/Sound",
74797+
"type" : "JSON",
74798+
"implicit" : 1
74799+
}
7484874800
, {
7484974801
"name" : "jit.gl.syphonclient.mxo",
7485074802
"type" : "iLaX"
@@ -74986,6 +74938,13 @@
7498674938
"type" : "JSON",
7498774939
"implicit" : 1
7498874940
}
74941+
, {
74942+
"name" : "srcWrapper.maxpat",
74943+
"bootpath" : "~/Drive/work/code/max/major_projects/mercury_lc/mercury/mercury_ide/patchers",
74944+
"patcherrelativepath" : ".",
74945+
"type" : "JSON",
74946+
"implicit" : 1
74947+
}
7498974948
, {
7499074949
"name" : "syncToScale.maxpat",
7499174950
"bootpath" : "~/Drive/work/code/max/major_projects/mercury_lc/mercury/mercury_ide/patchers",
@@ -75007,6 +74966,13 @@
7500774966
"type" : "JSON",
7500874967
"implicit" : 1
7500974968
}
74969+
, {
74970+
"name" : "terrain.maxpat",
74971+
"bootpath" : "~/Documents/Mercury/Library/Sound",
74972+
"patcherrelativepath" : "../../../../../../../../../Documents/Mercury/Library/Sound",
74973+
"type" : "JSON",
74974+
"implicit" : 1
74975+
}
7501074976
, {
7501174977
"name" : "th.clockwarp~.maxpat",
7501274978
"bootpath" : "~/Drive/work/code/max/major_projects/mercury_lc/mercury/mercury_ide/external",

0 commit comments

Comments
 (0)