From 3622475cbecb1a2a16d757c9c59a8bbf17c9d6b7 Mon Sep 17 00:00:00 2001
From: mwinter <mwinter@unboundedpress.org>
Date: Tue, 4 Jul 2023 17:15:45 +0200
Subject: [PATCH] checked tempo and part ordering

---
 openstagecontrol/mixer_transport.json | 16 ++++++++++------
 supercollider/live_utilities.scd      | 21 +++++++++++----------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/openstagecontrol/mixer_transport.json b/openstagecontrol/mixer_transport.json
index def1587..0246722 100644
--- a/openstagecontrol/mixer_transport.json
+++ b/openstagecontrol/mixer_transport.json
@@ -340,7 +340,7 @@
                 "ignoreDefaults": false,
                 "bypass": false,
                 "onCreate": "",
-                "onValue": "var quantity = 6\nif(value === 'berger') {quantity = 6}\nelse if(value === 'robinson') {quantity = 8}\nelse if(value === 'penrose') {quantity = 6}\n\nsetVar('mixer/hdp/volume', 'quantity', quantity)\nsetVar('mixer/hdp/pan', 'quantity', quantity)\nsetVar('mixer/hdp/mute', 'quantity', quantity)"
+                "onValue": "var quantity = 6\nvar tempo = 60\nif(value === 'berger') {\n  quantity = 6\n  tempo = 60\n} else if(value === 'robinson') {\n  quantity = 8\n  tempo = 60\n} else if(value === 'penrose') {\n  quantity = 6\n  tempo = 120\n} else if(value === 'ammann') {\n  quantity = 8\n  tempo = 60\n} else if(value === 'kari') {\n  quantity = 7\n  tempo = 45\n} else if(value === 'jaendel') {\n  quantity = 32\n  tempo = 60\n}\n\nsetVar('mixer/hdp/volume', 'quantity', quantity)\nsetVar('mixer/hdp/pan', 'quantity', quantity)\nsetVar('mixer/hdp/mute', 'quantity', quantity)\nset('tempo', tempo)"
               },
               {
                 "type": "input",
@@ -544,7 +544,7 @@
                 "traversing": false,
                 "widgetType": "knob",
                 "quantity": "VAR{quantity, 6}",
-                "props": {},
+                "props": "{\"value\": #{$/(VAR{quantity, 6}-1)}}",
                 "value": "",
                 "default": "",
                 "linkId": "",
@@ -596,7 +596,9 @@
                 "traversing": false,
                 "widgetType": "fader",
                 "quantity": "VAR{quantity, 6}",
-                "props": {},
+                "props": {
+                  "value": 1
+                },
                 "value": "",
                 "default": "",
                 "linkId": "",
@@ -648,7 +650,9 @@
                 "traversing": false,
                 "widgetType": "button",
                 "quantity": "VAR{quantity, 6}",
-                "props": {},
+                "props": {
+                  "value": 1
+                },
                 "value": "",
                 "default": "",
                 "linkId": "",
@@ -752,8 +756,8 @@
                     "sensitivity": 1,
                     "steps": "",
                     "origin": "auto",
-                    "value": "",
-                    "default": "",
+                    "value": 1,
+                    "default": 1,
                     "linkId": "",
                     "address": "auto",
                     "preArgs": "",
diff --git a/supercollider/live_utilities.scd b/supercollider/live_utilities.scd
index 4478906..751a4c0 100644
--- a/supercollider/live_utilities.scd
+++ b/supercollider/live_utilities.scd
@@ -149,7 +149,7 @@ Event.addEventType(\osc, {
 
 ~ammannCreatePatternsForLive = {arg seqs, group;
 	var finSeqs;
-	finSeqs = seqs.collect({arg r, i;
+	finSeqs = seqs.reverse.collect({arg r, i;
 		Pbind(\instrument, \ammann,
 			//\buf, Pseq((i - ((0..(r.slice(nil, 2).flat.size - 1)) / 10).trunc.asInteger) % 8),
 			\group, group,
@@ -180,21 +180,21 @@ Event.addEventType(\osc, {
 	[
 		Pbind(\instrument, \kariNoise,
 			\group, group,
-			\out, 5,
-			\dur,  Pseq(dirs[0].slice(nil, 1) * 1.2),
+			\out, 0,
+			\dur,  Pseq(dirs[0].slice(nil, 1) /* * 1.2*/),
 			\snd, Pseq(dirs[0].slice(nil, 0))),
 		Pbind(\instrument, \kariBass,
 			\group, group,
-			\out, 6,
-			\dur,  Pseq(dirs[1].slice(nil, 1) * 1.2),
+			\out, 1,
+			\dur,  Pseq(dirs[1].slice(nil, 1) /* * 1.2*/),
 			\freq, Pseq((dirs[1].slice(nil, 0).collect({arg elem; [Rest(0), 36.midicps, 43.midicps][elem]})))),
 	] ++
 
-	dirs.drop(2).collect({arg row, i;
+	dirs.drop(2).reverse.collect({arg row, i;
 		Pbind(\instrument, \kariEnsemble,
 			\group, group,
-			\out, i,
-			\dur, Pseq(row.slice(nil, 1) * 1.2),
+			\out, i + 2,
+			\dur, Pseq(row.slice(nil, 1) /* * 1.2*/),
 			//\sustain, Pseq(row.slice(nil, 1) * 1.2),
 			\freq, Pseq(row.slice(nil, 0).collect({arg val; if(val == 5, {Rest(0)}, {(60 + (val.trunc * 7)).midicps})})),
 			\amp, 1)})
@@ -309,15 +309,16 @@ measureLengths = seqs[1].sum.collect({4});
 playbackData.add(\robinson -> [~robinsonCreatePatternsForLive.value(seqs, group), createTransportData.value(measureLengths), measureLengths]);
 
 seqs = File.readAllString((~dir +/+ "music_data" +/+ "penrose.txt").standardizePath).interpret;
-~seqs = seqs;
 measureLengths = seqs[1].sum.collect({4});
 playbackData.add(\penrose -> [~penroseCreatePatternsForLive.value(seqs, group), createTransportData.value(measureLengths), measureLengths]);
 
 seqs = File.readAllString((~dir +/+ "music_data" +/+ "ammann.txt").standardizePath).interpret;
+~seqs = seqs;
 measureLengths = seqs[0].collect({arg item; item[0].sum});
 playbackData.add(\ammann -> [~ammannCreatePatternsForLive.value(seqs, group), createTransportData.value(measureLengths), measureLengths]);
 
 seqs = File.readAllString((~dir +/+ "music_data" +/+ "kari.txt").standardizePath).interpret;
+~seqs = seqs;
 measureLengths = seqs[0].collect({arg item; item.last}).flatten;
 playbackData.add(\kari -> [~kariCreatePatternsForLive.value(seqs, group), createTransportData.value(measureLengths), measureLengths]);
 
@@ -373,7 +374,7 @@ TODOs:
 ~bergerMusic[0][6].collect({arg beats, measure; beats.asInteger.collect({arg beat; [measure + 1, beat + 1]})}).flatten;
 */
 
-~seqs[0][1][0]
+~seqs[7]
 [seqs[5], seqs[6], seqs[7], seqs[0], seqs[1], seqs[2]]
 
 0.25 * (3/4) * 16