Merge remote-tracking branch 'upstream/main'

fates-project · Mar 25, 2022 · 820de90 · 820de90
2 parents 6e5af20 + 0f05441
commit 820de90
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 95 deletions.
diff --git a/jack-cpu-capture/Makefile b/jack-cpu-capture/Makefile
diff --git a/jack-cpu-capture/main.c b/jack-cpu-capture/main.c
diff --git a/jack-cpu-capture/readme.md b/jack-cpu-capture/readme.md
diff --git a/sc/engines/Engine_PolyPerc.sc b/sc/engines/Engine_PolyPerc.sc
@@ -53,4 +53,8 @@ Engine_PolyPerc : CroneEngine {
 			pan = msg[1];
 		});
 	}
+
+	free { 
+		pg.free;
+	}
 }
diff --git a/sc/engines/Engine_PolySub.sc b/sc/engines/Engine_PolySub.sc
@@ -184,6 +184,8 @@ Engine_PolySub : CroneEngine {
 	free {
 		gr.free;
 		ctlBus.do({ arg bus, i; bus.free; });
+		mixBus.do({ arg bus, i; bus.free; });
+
 	}
 
 } // class
diff --git a/update/changelog.txt b/update/changelog.txt
@@ -5,6 +5,13 @@
 - FIX softcut initialization glitch @catfact
 - FIX compilation optimization flags @catfact
 - NEW system log export @tehn
+- FIX polysub/polysub memleaks @catfact
+
+# maiden 1.1.6
+
+- FIX content type so .sc files can be edited in maiden once again (#219)
+@ngwese
+- FIX address linting errors (#216) @midouest
 
 
 # 220306

diff --git a/update/update.sh b/update/update.sh
@@ -12,8 +12,8 @@ fi;
 # basic repo updates
 sudo rm -rf /home/we/norns
 cp -a norns /home/we/
-#sudo rm -rf /home/we/maiden
-#cp -a maiden /home/we/
+sudo rm -rf /home/we/maiden
+cp -a maiden /home/we/
 
 # version/changelog
 cp version.txt /home/we/