emitter is deprecated, now new osc as in playground

tmhglnd · May 28, 2024 · d570b2d · d570b2d
1 parent 520eb49
commit d570b2d
Show file tree

Hide file tree

Showing 7 changed files with 252 additions and 161 deletions.
diff --git a/grammar/data/bind-functions.gen.json b/grammar/data/bind-functions.gen.json
@@ -40,6 +40,16 @@
     "rhythm": "beat",
     "play": "beat"
   },
+  "osc": {
+    "id": "name",
+    "tag": "address",
+    "url": "address",
+    "aux": "group",
+    "bus": "group",
+    "timing": "time",
+    "rhythm": "beat",
+    "play": "beat"
+  },
   "synth": {
     "gain": "amp",
     "vol": "amp",

diff --git a/grammar/data/instrument-methods.json b/grammar/data/instrument-methods.json
@@ -20,6 +20,14 @@
 		"beat"
 	],
 
+	"osc" : [
+		"name",
+		"address",
+		"group",
+		"time",
+		"beat"
+	],
+
 	"synth" : [
 		"amp",
 		"beat",

diff --git a/mercury_ide/data/bind-functions.gen.json b/mercury_ide/data/bind-functions.gen.json
@@ -40,6 +40,16 @@
     "rhythm": "beat",
     "play": "beat"
   },
+  "osc": {
+    "id": "name",
+    "tag": "address",
+    "url": "address",
+    "aux": "group",
+    "bus": "group",
+    "timing": "time",
+    "rhythm": "beat",
+    "play": "beat"
+  },
   "synth": {
     "gain": "amp",
     "vol": "amp",

diff --git a/mercury_ide/data/binding-instruments.json b/mercury_ide/data/binding-instruments.json
@@ -8,6 +8,10 @@
 		"osc" : [ "osc_out", 5 ],
 		"midi" : [ "midi_out", 6 ]
 	}
+,
+	"osc" : {
+		"default" : [ "osc_out", 5 ]
+	}
 ,
 	"midi" : {
 

diff --git a/mercury_ide/data/initials.json b/mercury_ide/data/initials.json
@@ -100,7 +100,7 @@
 ,
 	"emitter" : 	{
 		"beat" : 1,
-		"time" : "1/16",
+		"time" : "1/4",
 		"once" : 0,
 		"warp" : 1,
 		"ratchet" : [ 0, 2 ],
@@ -110,6 +110,18 @@
 		"sendOSC" : 1,
 		"clock" : 0
 	}
+,	"osc" : 	{
+		"beat" : 1,
+		"time" : "1/4",
+		"once" : 0,
+		"warp" : 1,
+		"ratchet" : [ 0, 2 ],
+		"name" : "no_name",
+		"group" : "no_group",
+		"emit" : 1,
+		"sendOSC" : 1,
+		"clock" : 0
+	}
 ,
 	"midi" : 	{
 		"amp" : 0.8,

diff --git a/mercury_ide/patchers/_mercury_main.maxpat b/mercury_ide/patchers/_mercury_main.maxpat
@@ -52177,6 +52177,8 @@
 									"saved_object_attributes" : 									{
 										"autostart" : 1,
 										"defer" : 0,
+										"node_bin_path" : "",
+										"npm_bin_path" : "",
 										"watch" : 1
 									}
 ,
@@ -59316,8 +59318,6 @@
 									"saved_object_attributes" : 									{
 										"autostart" : 0,
 										"defer" : 1,
-										"node_bin_path" : "",
-										"npm_bin_path" : "",
 										"watch" : 1
 									}
 ,