Merge branch 'dev' of https://github.com/electro-smith/oopsy into dev

electro-smith · Dec 8, 2020 · 331f5f5 · 331f5f5
2 parents f482b91 + b29beb1
commit 331f5f5
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/source/oopsy.js b/source/oopsy.js
@@ -239,7 +239,6 @@ int main(void) {
 	try {
 		try {
 			console.log(execSync("make clean", { cwd: build_path }).toString())
-			// TODO: make this cross-platform:
 			if (os.platform() == "win32") {
 				// Gather up make output to run command per line as child process
 				let build_cmd = execSync("make -n", { cwd: build_path }).toString().split(os.EOL)

diff --git a/templates/oopsy_pod.maxpat b/templates/oopsy_pod.maxpat
@@ -85,6 +85,18 @@
 						"subpatcher_template" : "",
 						"assistshowspatchername" : 0,
 						"boxes" : [ 							{
+								"box" : 								{
+									"id" : "obj-21",
+									"maxclass" : "newobj",
+									"numinlets" : 2,
+									"numoutlets" : 1,
+									"outlettype" : [ "" ],
+									"patching_rect" : [ 284.5, 315.0, 29.5, 22.0 ],
+									"text" : "*"
+								}
+
+							}
+, 							{
 								"box" : 								{
 									"id" : "obj-20",
 									"linecount" : 3,
@@ -104,7 +116,7 @@
 									"numinlets" : 1,
 									"numoutlets" : 2,
 									"outlettype" : [ "", "" ],
-									"patching_rect" : [ 225.5, 313.0, 36.0, 22.0 ],
+									"patching_rect" : [ 225.5, 284.0, 36.0, 22.0 ],
 									"text" : "cycle"
 								}
 
@@ -371,6 +383,13 @@
 									"source" : [ "obj-1", 0 ]
 								}
 
+							}
+, 							{
+								"patchline" : 								{
+									"destination" : [ "obj-21", 1 ],
+									"source" : [ "obj-14", 0 ]
+								}
+
 							}
 , 							{
 								"patchline" : 								{
@@ -382,7 +401,7 @@
 							}
 , 							{
 								"patchline" : 								{
-									"destination" : [ "obj-15", 0 ],
+									"destination" : [ "obj-21", 0 ],
 									"order" : 0,
 									"source" : [ "obj-16", 0 ]
 								}
@@ -394,6 +413,13 @@
 									"source" : [ "obj-2", 0 ]
 								}
 
+							}
+, 							{
+								"patchline" : 								{
+									"destination" : [ "obj-15", 0 ],
+									"source" : [ "obj-21", 0 ]
+								}
+
 							}
 , 							{
 								"patchline" : 								{