Merge branch 'main' of ssh://213.61.58.36:2222/kieran-mcauliffe/healing-soundscapes

Create hss-Xiao-2024-3.json
Instrument names fixed
2024-11-26 19:52:46 +01:00 · 2024-11-26 19:52:31 +01:00 · 2024-11-26 12:48:26 +01:00 · 2024-11-25 21:35:48 +01:00 · 2024-11-25 21:35:34 +01:00 · 2024-11-25 10:04:24 +01:00
18 changed files with 590809 additions and 2227 deletions
--- a/HSS_Greg_Compositions.V1.json
+++ b/HSS_Greg_Compositions.V1.json
--- a/Presets/HSS_Greg_Compositions.V1-Preset123.json
+++ b/Presets/HSS_Greg_Compositions.V1-Preset123.json
--- a/Presets/HSS_Greg_Compositions.V1-debug.json
+++ b/Presets/HSS_Greg_Compositions.V1-debug.json
--- a/Presets/HSS_Greg_Compositions.V2-Night.json
+++ b/Presets/HSS_Greg_Compositions.V2-Night.json
--- a/Presets/HSS_Greg_Compositions.V2-whistles.json
+++ b/Presets/HSS_Greg_Compositions.V2-whistles.json
--- a/Presets/MeiyanChenPreset2024-08-21.json
+++ b/Presets/MeiyanChenPreset2024-08-21.json
@@ -28,9 +28,9 @@
 					"Djster.µbus[0]::attenuation" : [ 50.0 ],
 					"Djster.µbus[0]::chordal_weight" : [ 1.0 ],
 					"Djster.µbus[0]::dynamics" : [ 64.0 ],
-					"Djster.µbus[0]::event_length" : [ 3000.000000000000455 ],
+					"Djster.µbus[0]::event_length" : [ 20000.0 ],
 					"Djster.µbus[0]::event_length_display_style" : [ 0.0 ],
-					"Djster.µbus[0]::eventfulness" : [ 15.787401574803217 ],
+					"Djster.µbus[0]::eventfulness" : [ 10.0 ],
 					"Djster.µbus[0]::global_transport_active" : [ 1.0 ],
 					"Djster.µbus[0]::harmoniclarity" : [ 90.0 ],
 					"Djster.µbus[0]::instance" : [ 1.0 ],
@@ -4190,9 +4190,9 @@
 					"Djster.µbus[1]::attenuation" : [ 50.0 ],
 					"Djster.µbus[1]::chordal_weight" : [ 1.0 ],
 					"Djster.µbus[1]::dynamics" : [ 50.0 ],
-					"Djster.µbus[1]::event_length" : [ 6000.000000000000909 ],
+					"Djster.µbus[1]::event_length" : [ 14999.999999999998181 ],
 					"Djster.µbus[1]::event_length_display_style" : [ 0.0 ],
-					"Djster.µbus[1]::eventfulness" : [ 15.0 ],
+					"Djster.µbus[1]::eventfulness" : [ 10.0 ],
 					"Djster.µbus[1]::global_transport_active" : [ 1.0 ],
 					"Djster.µbus[1]::harmoniclarity" : [ 82.283464566929126 ],
 					"Djster.µbus[1]::instance" : [ 2.0 ],
@@ -8351,10 +8351,10 @@
 					"Djster.µbus[1]::presets::file" : [ 0 ],
 					"Djster.µbus[2]::attenuation" : [ 50.0 ],
 					"Djster.µbus[2]::chordal_weight" : [ 1.0 ],
-					"Djster.µbus[2]::dynamics" : [ 78.0 ],
-					"Djster.µbus[2]::event_length" : [ 10000.0 ],
+					"Djster.µbus[2]::dynamics" : [ 64.0 ],
+					"Djster.µbus[2]::event_length" : [ 9999.999999999990905 ],
 					"Djster.µbus[2]::event_length_display_style" : [ 0.0 ],
-					"Djster.µbus[2]::eventfulness" : [ 15.0 ],
+					"Djster.µbus[2]::eventfulness" : [ 10.0 ],
 					"Djster.µbus[2]::global_transport_active" : [ 1.0 ],
 					"Djster.µbus[2]::harmoniclarity" : [ 80.0 ],
 					"Djster.µbus[2]::instance" : [ 3.0 ],
@@ -12514,9 +12514,9 @@
 					"Djster.µbus[3]::attenuation" : [ 50.0 ],
 					"Djster.µbus[3]::chordal_weight" : [ 1.0 ],
 					"Djster.µbus[3]::dynamics" : [ 50.0 ],
-					"Djster.µbus[3]::event_length" : [ 20000.0 ],
+					"Djster.µbus[3]::event_length" : [ 10000.0 ],
 					"Djster.µbus[3]::event_length_display_style" : [ 0.0 ],
-					"Djster.µbus[3]::eventfulness" : [ 15.0 ],
+					"Djster.µbus[3]::eventfulness" : [ 10.0 ],
 					"Djster.µbus[3]::global_transport_active" : [ 1.0 ],
 					"Djster.µbus[3]::harmoniclarity" : [ 90.0 ],
 					"Djster.µbus[3]::instance" : [ 4.0 ],
@@ -16705,7 +16705,7 @@
 					"Djster.µbus[0]::dynamics" : [ 64.0 ],
 					"Djster.µbus[0]::event_length" : [ 10000.0 ],
 					"Djster.µbus[0]::event_length_display_style" : [ 0.0 ],
-					"Djster.µbus[0]::eventfulness" : [ 15.0 ],
+					"Djster.µbus[0]::eventfulness" : [ 10.0 ],
 					"Djster.µbus[0]::global_transport_active" : [ 1.0 ],
 					"Djster.µbus[0]::harmoniclarity" : [ 80.708661417322787 ],
 					"Djster.µbus[0]::instance" : [ 1.0 ],
@@ -20864,10 +20864,10 @@
 					"Djster.µbus[0]::presets::file" : [ 0 ],
 					"Djster.µbus[1]::attenuation" : [ 50.0 ],
 					"Djster.µbus[1]::chordal_weight" : [ 1.0 ],
-					"Djster.µbus[1]::dynamics" : [ 40.0 ],
+					"Djster.µbus[1]::dynamics" : [ 60.0 ],
 					"Djster.µbus[1]::event_length" : [ 10000.0 ],
 					"Djster.µbus[1]::event_length_display_style" : [ 0.0 ],
-					"Djster.µbus[1]::eventfulness" : [ 15.0 ],
+					"Djster.µbus[1]::eventfulness" : [ 10.0 ],
 					"Djster.µbus[1]::global_transport_active" : [ 1.0 ],
 					"Djster.µbus[1]::harmoniclarity" : [ 50.0 ],
 					"Djster.µbus[1]::instance" : [ 2.0 ],
@@ -20882,10 +20882,10 @@
 					"Djster.µbus[1]::ostinato-buffer" : [ 0.0 ],
 					"Djster.µbus[1]::outset_pulses" : [ 1.0 ],
 					"Djster.µbus[1]::overlap" : [ 1.0 ],
-					"Djster.µbus[1]::pitch_center" : [ 72.0 ],
+					"Djster.µbus[1]::pitch_center" : [ 60.0 ],
 					"Djster.µbus[1]::pitch_range" : [ 7.000000000000002 ],
 					"Djster.µbus[1]::precision" : [ 1.0 ],
-					"Djster.µbus[1]::pulse_length" : [ 333.333333333333314 ],
+					"Djster.µbus[1]::pulse_length" : [ 999.999999999999659 ],
 					"Djster.µbus[1]::scale" : [ "Major Pentatonic" ],
 					"Djster.µbus[1]::scales" : [ 						{
 							"Major" : 							{
@@ -25015,21 +25015,21 @@
 					"Djster.µbus[1]::silent_downbeat" : [ 0.0 ],
 					"Djster.µbus[1]::sorted" : [ 1.0 ],
 					"Djster.µbus[1]::stream" : [ 1.0 ],
-					"Djster.µbus[1]::subdivision" : [ "3 3" ],
+					"Djster.µbus[1]::subdivision" : [ "3" ],
 					"Djster.µbus[1]::tempo" : [ 20.0 ],
 					"Djster.µbus[1]::timesig_denominator" : [ "4" ],
 					"Djster.µbus[1]::timesig_numerator" : [ 4 ],
-					"Djster.µbus[1]::tonic_pitch" : [ 72.0 ],
+					"Djster.µbus[1]::tonic_pitch" : [ 60.0 ],
 					"Djster.µbus[1]::use_transport" : [ 1.0 ],
 					"Djster.µbus[1]::µbus" : [ -1 ],
-					"Djster.µbus[1]::meter" : [ "3 3" ],
+					"Djster.µbus[1]::meter" : [ "3" ],
 					"Djster.µbus[1]::presets::file" : [ 0 ],
 					"Djster.µbus[2]::attenuation" : [ 50.0 ],
 					"Djster.µbus[2]::chordal_weight" : [ 1.0 ],
 					"Djster.µbus[2]::dynamics" : [ 60.0 ],
 					"Djster.µbus[2]::event_length" : [ 10000.0 ],
 					"Djster.µbus[2]::event_length_display_style" : [ 0.0 ],
-					"Djster.µbus[2]::eventfulness" : [ 15.0 ],
+					"Djster.µbus[2]::eventfulness" : [ 10.0 ],
 					"Djster.µbus[2]::global_transport_active" : [ 1.0 ],
 					"Djster.µbus[2]::harmoniclarity" : [ 80.0 ],
 					"Djster.µbus[2]::instance" : [ 3.0 ],
@@ -25047,7 +25047,7 @@
 					"Djster.µbus[2]::pitch_center" : [ 60.0 ],
 					"Djster.µbus[2]::pitch_range" : [ 12.000000000000004 ],
 					"Djster.µbus[2]::precision" : [ 1.0 ],
-					"Djster.µbus[2]::pulse_length" : [ 749.999999999999773 ],
+					"Djster.µbus[2]::pulse_length" : [ 1500.0 ],
 					"Djster.µbus[2]::scale" : [ "Major Pentatonic" ],
 					"Djster.µbus[2]::scales" : [ 						{
 							"Major" : 							{
@@ -29177,21 +29177,21 @@
 					"Djster.µbus[2]::silent_downbeat" : [ 0.0 ],
 					"Djster.µbus[2]::sorted" : [ 1.0 ],
 					"Djster.µbus[2]::stream" : [ 1.0 ],
-					"Djster.µbus[2]::subdivision" : [ "2 2" ],
+					"Djster.µbus[2]::subdivision" : [ "2" ],
 					"Djster.µbus[2]::tempo" : [ 20.0 ],
 					"Djster.µbus[2]::timesig_denominator" : [ "4" ],
 					"Djster.µbus[2]::timesig_numerator" : [ 4 ],
 					"Djster.µbus[2]::tonic_pitch" : [ 60.0 ],
 					"Djster.µbus[2]::use_transport" : [ 1.0 ],
 					"Djster.µbus[2]::µbus" : [ -1 ],
-					"Djster.µbus[2]::meter" : [ "2 2" ],
+					"Djster.µbus[2]::meter" : [ "2" ],
 					"Djster.µbus[2]::presets::file" : [ 0 ],
 					"Djster.µbus[3]::attenuation" : [ 50.0 ],
 					"Djster.µbus[3]::chordal_weight" : [ 1.0 ],
-					"Djster.µbus[3]::dynamics" : [ 50.0 ],
+					"Djster.µbus[3]::dynamics" : [ 60.0 ],
 					"Djster.µbus[3]::event_length" : [ 10000.0 ],
 					"Djster.µbus[3]::event_length_display_style" : [ 0.0 ],
-					"Djster.µbus[3]::eventfulness" : [ 15.0 ],
+					"Djster.µbus[3]::eventfulness" : [ 5.0 ],
 					"Djster.µbus[3]::global_transport_active" : [ 1.0 ],
 					"Djster.µbus[3]::harmoniclarity" : [ 80.0 ],
 					"Djster.µbus[3]::instance" : [ 4.0 ],
@@ -29209,7 +29209,7 @@
 					"Djster.µbus[3]::pitch_center" : [ 48.0 ],
 					"Djster.µbus[3]::pitch_range" : [ 12.000000000000004 ],
 					"Djster.µbus[3]::precision" : [ 1.0 ],
-					"Djster.µbus[3]::pulse_length" : [ 500.000000000000341 ],
+					"Djster.µbus[3]::pulse_length" : [ 749.999999999999773 ],
 					"Djster.µbus[3]::scale" : [ "Major Pentatonic" ],
 					"Djster.µbus[3]::scales" : [ 						{
 							"Major" : 							{
@@ -33339,14 +33339,14 @@
 					"Djster.µbus[3]::silent_downbeat" : [ 0.0 ],
 					"Djster.µbus[3]::sorted" : [ 1.0 ],
 					"Djster.µbus[3]::stream" : [ 1.0 ],
-					"Djster.µbus[3]::subdivision" : [ "2 3" ],
+					"Djster.µbus[3]::subdivision" : [ "2 2" ],
 					"Djster.µbus[3]::tempo" : [ 20.0 ],
 					"Djster.µbus[3]::timesig_denominator" : [ "4" ],
 					"Djster.µbus[3]::timesig_numerator" : [ 4 ],
 					"Djster.µbus[3]::tonic_pitch" : [ 48.0 ],
 					"Djster.µbus[3]::use_transport" : [ 1.0 ],
 					"Djster.µbus[3]::µbus" : [ -1 ],
-					"Djster.µbus[3]::meter" : [ "2 3" ],
+					"Djster.µbus[3]::meter" : [ "2 2" ],
 					"Djster.µbus[3]::presets::file" : [ 0 ]
 				}

@@ -33380,7 +33380,7 @@
 					"Djster.µbus[0]::dynamics" : [ 64.0 ],
 					"Djster.µbus[0]::event_length" : [ 10000.0 ],
 					"Djster.µbus[0]::event_length_display_style" : [ 0.0 ],
-					"Djster.µbus[0]::eventfulness" : [ 10.0 ],
+					"Djster.µbus[0]::eventfulness" : [ 15.0 ],
 					"Djster.µbus[0]::global_transport_active" : [ 1.0 ],
 					"Djster.µbus[0]::harmoniclarity" : [ 80.708661417322787 ],
 					"Djster.µbus[0]::instance" : [ 1.0 ],
@@ -37539,10 +37539,10 @@
 					"Djster.µbus[0]::presets::file" : [ 0 ],
 					"Djster.µbus[1]::attenuation" : [ 50.0 ],
 					"Djster.µbus[1]::chordal_weight" : [ 1.0 ],
-					"Djster.µbus[1]::dynamics" : [ 60.0 ],
+					"Djster.µbus[1]::dynamics" : [ 48.0 ],
 					"Djster.µbus[1]::event_length" : [ 10000.0 ],
 					"Djster.µbus[1]::event_length_display_style" : [ 0.0 ],
-					"Djster.µbus[1]::eventfulness" : [ 15.0 ],
+					"Djster.µbus[1]::eventfulness" : [ 5.0 ],
 					"Djster.µbus[1]::global_transport_active" : [ 1.0 ],
 					"Djster.µbus[1]::harmoniclarity" : [ 80.0 ],
 					"Djster.µbus[1]::instance" : [ 2.0 ],
@@ -41704,7 +41704,7 @@
 					"Djster.µbus[2]::dynamics" : [ 60.0 ],
 					"Djster.µbus[2]::event_length" : [ 10000.0 ],
 					"Djster.µbus[2]::event_length_display_style" : [ 0.0 ],
-					"Djster.µbus[2]::eventfulness" : [ 10.0 ],
+					"Djster.µbus[2]::eventfulness" : [ 15.0 ],
 					"Djster.µbus[2]::global_transport_active" : [ 1.0 ],
 					"Djster.µbus[2]::harmoniclarity" : [ 80.0 ],
 					"Djster.µbus[2]::instance" : [ 3.0 ],
@@ -45866,7 +45866,7 @@
 					"Djster.µbus[3]::dynamics" : [ 60.0 ],
 					"Djster.µbus[3]::event_length" : [ 10000.0 ],
 					"Djster.µbus[3]::event_length_display_style" : [ 0.0 ],
-					"Djster.µbus[3]::eventfulness" : [ 10.0 ],
+					"Djster.µbus[3]::eventfulness" : [ 5.0 ],
 					"Djster.µbus[3]::global_transport_active" : [ 1.0 ],
 					"Djster.µbus[3]::harmoniclarity" : [ 80.0 ],
 					"Djster.µbus[3]::instance" : [ 4.0 ],
@@ -54217,9 +54217,9 @@
 					"Djster.µbus[1]::dynamics" : [ 60.0 ],
 					"Djster.µbus[1]::event_length" : [ 10000.0 ],
 					"Djster.µbus[1]::event_length_display_style" : [ 0.0 ],
-					"Djster.µbus[1]::eventfulness" : [ 10.0 ],
+					"Djster.µbus[1]::eventfulness" : [ 5.0 ],
 					"Djster.µbus[1]::global_transport_active" : [ 1.0 ],
-					"Djster.µbus[1]::harmoniclarity" : [ 80.0 ],
+					"Djster.µbus[1]::harmoniclarity" : [ 70.0 ],
 					"Djster.µbus[1]::instance" : [ 2.0 ],
 					"Djster.µbus[1]::melodic_cohesion" : [ 50.0 ],
 					"Djster.µbus[1]::melody_scope" : [ 7.000000000000002 ],
@@ -54232,10 +54232,10 @@
 					"Djster.µbus[1]::ostinato-buffer" : [ 0.0 ],
 					"Djster.µbus[1]::outset_pulses" : [ 1.0 ],
 					"Djster.µbus[1]::overlap" : [ 1.0 ],
-					"Djster.µbus[1]::pitch_center" : [ 48.0 ],
+					"Djster.µbus[1]::pitch_center" : [ 60.0 ],
 					"Djster.µbus[1]::pitch_range" : [ 7.000000000000002 ],
 					"Djster.µbus[1]::precision" : [ 1.0 ],
-					"Djster.µbus[1]::pulse_length" : [ 500.000000000000341 ],
+					"Djster.µbus[1]::pulse_length" : [ 749.999999999999773 ],
 					"Djster.µbus[1]::scale" : [ "Major Pentatonic" ],
 					"Djster.µbus[1]::scales" : [ 						{
 							"Major" : 							{
@@ -58365,21 +58365,21 @@
 					"Djster.µbus[1]::silent_downbeat" : [ 0.0 ],
 					"Djster.µbus[1]::sorted" : [ 1.0 ],
 					"Djster.µbus[1]::stream" : [ 1.0 ],
-					"Djster.µbus[1]::subdivision" : [ "2 3" ],
+					"Djster.µbus[1]::subdivision" : [ "2 2" ],
 					"Djster.µbus[1]::tempo" : [ 20.0 ],
 					"Djster.µbus[1]::timesig_denominator" : [ "4" ],
 					"Djster.µbus[1]::timesig_numerator" : [ 4 ],
-					"Djster.µbus[1]::tonic_pitch" : [ 48.0 ],
+					"Djster.µbus[1]::tonic_pitch" : [ 60.0 ],
 					"Djster.µbus[1]::use_transport" : [ 1.0 ],
 					"Djster.µbus[1]::µbus" : [ -1 ],
-					"Djster.µbus[1]::meter" : [ "2 3" ],
+					"Djster.µbus[1]::meter" : [ "2 2" ],
 					"Djster.µbus[1]::presets::file" : [ 0 ],
 					"Djster.µbus[2]::attenuation" : [ 50.0 ],
 					"Djster.µbus[2]::chordal_weight" : [ 1.0 ],
 					"Djster.µbus[2]::dynamics" : [ 60.0 ],
 					"Djster.µbus[2]::event_length" : [ 10000.0 ],
 					"Djster.µbus[2]::event_length_display_style" : [ 0.0 ],
-					"Djster.µbus[2]::eventfulness" : [ 10.0 ],
+					"Djster.µbus[2]::eventfulness" : [ 5.0 ],
 					"Djster.µbus[2]::global_transport_active" : [ 1.0 ],
 					"Djster.µbus[2]::harmoniclarity" : [ 80.0 ],
 					"Djster.µbus[2]::instance" : [ 3.0 ],
@@ -66730,7 +66730,7 @@
 					"Djster.µbus[0]::dynamics" : [ 64.0 ],
 					"Djster.µbus[0]::event_length" : [ 10000.0 ],
 					"Djster.µbus[0]::event_length_display_style" : [ 0.0 ],
-					"Djster.µbus[0]::eventfulness" : [ 15.0 ],
+					"Djster.µbus[0]::eventfulness" : [ 10.0 ],
 					"Djster.µbus[0]::global_transport_active" : [ 1.0 ],
 					"Djster.µbus[0]::harmoniclarity" : [ 80.708661417322787 ],
 					"Djster.µbus[0]::instance" : [ 1.0 ],
@@ -70892,7 +70892,7 @@
 					"Djster.µbus[1]::dynamics" : [ 40.0 ],
 					"Djster.µbus[1]::event_length" : [ 10000.0 ],
 					"Djster.µbus[1]::event_length_display_style" : [ 0.0 ],
-					"Djster.µbus[1]::eventfulness" : [ 15.0 ],
+					"Djster.µbus[1]::eventfulness" : [ 10.0 ],
 					"Djster.µbus[1]::global_transport_active" : [ 1.0 ],
 					"Djster.µbus[1]::harmoniclarity" : [ 80.0 ],
 					"Djster.µbus[1]::instance" : [ 2.0 ],
@@ -75054,7 +75054,7 @@
 					"Djster.µbus[2]::dynamics" : [ 64.0 ],
 					"Djster.µbus[2]::event_length" : [ 10000.0 ],
 					"Djster.µbus[2]::event_length_display_style" : [ 0.0 ],
-					"Djster.µbus[2]::eventfulness" : [ 15.0 ],
+					"Djster.µbus[2]::eventfulness" : [ 10.0 ],
 					"Djster.µbus[2]::global_transport_active" : [ 1.0 ],
 					"Djster.µbus[2]::harmoniclarity" : [ 80.0 ],
 					"Djster.µbus[2]::instance" : [ 3.0 ],
@@ -75069,10 +75069,10 @@
 					"Djster.µbus[2]::ostinato-buffer" : [ 0.0 ],
 					"Djster.µbus[2]::outset_pulses" : [ 1.0 ],
 					"Djster.µbus[2]::overlap" : [ 1.0 ],
-					"Djster.µbus[2]::pitch_center" : [ 48.0 ],
+					"Djster.µbus[2]::pitch_center" : [ 60.0 ],
 					"Djster.µbus[2]::pitch_range" : [ 7.000000000000002 ],
 					"Djster.µbus[2]::precision" : [ 1.0 ],
-					"Djster.µbus[2]::pulse_length" : [ 333.333333333333314 ],
+					"Djster.µbus[2]::pulse_length" : [ 500.000000000000341 ],
 					"Djster.µbus[2]::scale" : [ "Major Pentatonic" ],
 					"Djster.µbus[2]::scales" : [ 						{
 							"Major" : 							{
@@ -79202,21 +79202,21 @@
 					"Djster.µbus[2]::silent_downbeat" : [ 0.0 ],
 					"Djster.µbus[2]::sorted" : [ 1.0 ],
 					"Djster.µbus[2]::stream" : [ 1.0 ],
-					"Djster.µbus[2]::subdivision" : [ "3 3" ],
+					"Djster.µbus[2]::subdivision" : [ "3 2" ],
 					"Djster.µbus[2]::tempo" : [ 20.0 ],
 					"Djster.µbus[2]::timesig_denominator" : [ "4" ],
 					"Djster.µbus[2]::timesig_numerator" : [ 4 ],
-					"Djster.µbus[2]::tonic_pitch" : [ 48.0 ],
+					"Djster.µbus[2]::tonic_pitch" : [ 60.0 ],
 					"Djster.µbus[2]::use_transport" : [ 1.0 ],
 					"Djster.µbus[2]::µbus" : [ -1 ],
-					"Djster.µbus[2]::meter" : [ "3 3" ],
+					"Djster.µbus[2]::meter" : [ "3 2" ],
 					"Djster.µbus[2]::presets::file" : [ 0 ],
 					"Djster.µbus[3]::attenuation" : [ 50.0 ],
 					"Djster.µbus[3]::chordal_weight" : [ 1.0 ],
 					"Djster.µbus[3]::dynamics" : [ 50.0 ],
 					"Djster.µbus[3]::event_length" : [ 10000.0 ],
 					"Djster.µbus[3]::event_length_display_style" : [ 0.0 ],
-					"Djster.µbus[3]::eventfulness" : [ 15.0 ],
+					"Djster.µbus[3]::eventfulness" : [ 10.0 ],
 					"Djster.µbus[3]::global_transport_active" : [ 1.0 ],
 					"Djster.µbus[3]::harmoniclarity" : [ 80.0 ],
 					"Djster.µbus[3]::instance" : [ 4.0 ],
--- a/Presets/Hss-Chen-Preset-2.json
+++ b/Presets/Hss-Chen-Preset-2.json
--- a/Presets/hss-Xiao-2024-2.json
+++ b/Presets/hss-Xiao-2024-2.json
@@ -5,7 +5,7 @@
 			"1" : 			{
 				"id" : 1,
 				"data" : 				{
-					"hub::instrument::bank" : [ "HSS_Samples_25.7.24.json" ],
+					"hub::instrument::bank" : [ "HSS_Samples.json" ],
 					"hub::instrument::instrument-1" : [ "Gentle-Metallic-1.instr.json" ],
 					"hub::instrument::instrument-2" : [ "kalimba1_circleskin.instr.json" ],
 					"hub::instrument::instrument-3" : [ "Dreamy-Fifths.instr.json" ],
@@ -16680,7 +16680,7 @@
 			"2" : 			{
 				"id" : 2,
 				"data" : 				{
-					"hub::instrument::bank" : [ "HSS_Samples_25.7.24.json" ],
+					"hub::instrument::bank" : [ "HSS_Samples.json" ],
 					"hub::instrument::instrument-1" : [ "Gentle-Metallic-1.instr.json" ],
 					"hub::instrument::instrument-2" : [ "kalimba1_circleskin.instr.json" ],
 					"hub::instrument::instrument-3" : [ "Dreamy-Fifths.instr.json" ],
@@ -33355,7 +33355,7 @@
 			"3" : 			{
 				"id" : 3,
 				"data" : 				{
-					"hub::instrument::bank" : [ "HSS_Samples_25.7.24.json" ],
+					"hub::instrument::bank" : [ "HSS_Samples.json" ],
 					"hub::instrument::instrument-1" : [ "Gentle-Metallic-1.instr.json" ],
 					"hub::instrument::instrument-2" : [ "kalimba1_circleskin.instr.json" ],
 					"hub::instrument::instrument-3" : [ "Dreamy-Fifths.instr.json" ],
@@ -50030,7 +50030,7 @@
 			"4" : 			{
 				"id" : 4,
 				"data" : 				{
-					"hub::instrument::bank" : [ "HSS_Samples_25.7.24.json" ],
+					"hub::instrument::bank" : [ "HSS_Samples.json" ],
 					"hub::instrument::instrument-1" : [ "Gentle-Metallic-1.instr.json" ],
 					"hub::instrument::instrument-2" : [ "kalimba1_circleskin.instr.json" ],
 					"hub::instrument::instrument-3" : [ "G_Musicbox.instr.json" ],
@@ -66705,7 +66705,7 @@
 			"5" : 			{
 				"id" : 5,
 				"data" : 				{
-					"hub::instrument::bank" : [ "HSS_Samples_25.7.24.json" ],
+					"hub::instrument::bank" : [ "HSS_Samples.json" ],
 					"hub::instrument::instrument-1" : [ "Gentle-Metallic-1.instr.json" ],
 					"hub::instrument::instrument-2" : [ "kalimba1_circleskin.instr.json" ],
 					"hub::instrument::instrument-3" : [ "G_Crystal.instr.json" ],
--- a/Presets/hss-Xiao-2024-3.json
+++ b/Presets/hss-Xiao-2024-3.json
--- a/Presets/hss-Xiao-2024.json
+++ b/Presets/hss-Xiao-2024.json
@@ -5,7 +5,7 @@
 			"1" : 			{
 				"id" : 1,
 				"data" : 				{
-					"hub::instrument::bank" : [ "HSS_Samples_25.7.24.json" ],
+					"hub::instrument::bank" : [ "HSS_Samples.json" ],
 					"hub::instrument::instrument-1" : [ "X_Windwhistle.instr.json" ],
 					"hub::instrument::instrument-2" : [ "X_Darkswarm.instr.json" ],
 					"hub::instrument::instrument-3" : [ "X_BasicBells.instr.json" ],
@@ -16680,7 +16680,7 @@
 			"2" : 			{
 				"id" : 2,
 				"data" : 				{
-					"hub::instrument::bank" : [ "HSS_Samples_25.7.24.json" ],
+					"hub::instrument::bank" : [ "HSS_Samples.json" ],
 					"hub::instrument::instrument-1" : [ "X_Windwhistle.instr.json" ],
 					"hub::instrument::instrument-2" : [ "X_Darkswarm.instr.json" ],
 					"hub::instrument::instrument-3" : [ "X_BasicBells.instr.json" ],
@@ -33355,7 +33355,7 @@
 			"3" : 			{
 				"id" : 3,
 				"data" : 				{
-					"hub::instrument::bank" : [ "HSS_Samples_25.7.24.json" ],
+					"hub::instrument::bank" : [ "HSS_Samples.json" ],
 					"hub::instrument::instrument-1" : [ "X_Windwhistle.instr.json" ],
 					"hub::instrument::instrument-2" : [ "X_Darkswarm.instr.json" ],
 					"hub::instrument::instrument-3" : [ "X_BasicBells.instr.json" ],
@@ -50030,7 +50030,7 @@
 			"4" : 			{
 				"id" : 4,
 				"data" : 				{
-					"hub::instrument::bank" : [ "HSS_Samples_25.7.24.json" ],
+					"hub::instrument::bank" : [ "HSS_Samples.json" ],
 					"hub::instrument::instrument-1" : [ "X_Windwhistle.instr.json" ],
 					"hub::instrument::instrument-2" : [ "X_Grain.instr.json" ],
 					"hub::instrument::instrument-3" : [ "X_BasicBells.instr.json" ],
@@ -66705,7 +66705,7 @@
 			"5" : 			{
 				"id" : 5,
 				"data" : 				{
-					"hub::instrument::bank" : [ "HSS_Samples_25.7.24.json" ],
+					"hub::instrument::bank" : [ "HSS_Samples.json" ],
 					"hub::instrument::instrument-1" : [ "X_Darkswarm.instr.json" ],
 					"hub::instrument::instrument-2" : [ "X_Darkswarm.instr.json" ],
 					"hub::instrument::instrument-3" : [ "X_BasicBells.instr.json" ],
--- a/Presets/testweights.json
+++ b/Presets/testweights.json
--- a/SchedulingTool.maxpat
+++ b/SchedulingTool.maxpat
--- a/Banks/HSS_Samples.json
+++ b/Banks/HSS_Samples.json
@@ -11294,7 +11294,7 @@

 	}
 ,
-	"Simple-Glow.json" : 	{
+	"Simple-Glow.instr.json" : 	{
 		"1" : 		{
 			"sample" : "Simple-Glow-C2-p.wav",
 			"root_key" : 36,
@@ -12164,7 +12164,7 @@

 	}
 ,
-	"Warm-Bounce.json" : 	{
+	"Warm-Bounce.instr.json" : 	{
 		"1" : 		{
 			"sample" : "Warm-Bounce-C2-p.wav",
 			"root_key" : 36,
@@ -12671,7 +12671,7 @@

 	}
 ,
-	"Wide-Dimension.json" : 	{
+	"Wide-Dimension.instr.json" : 	{
 		"1" : 		{
 			"sample" : "Wide-Dimension-C2-p.wav",
 			"root_key" : 36,
--- a/Trajectories/TestTrajectory.txt
+++ b/Trajectories/TestTrajectory.txt
@@ -0,0 +1 @@
+00:00, 0.5 0.5;
--- a/deployment-scripts/daemon-serve.sh
+++ b/deployment-scripts/daemon-serve.sh
@@ -0,0 +1,6 @@
+cd ..
+IPADDR="$(ipconfig getifaddr en0)"
+echo "With machine on same local network, run : " 
+echo "\`git remote set-url origin git://$IPADDR/\`"
+echo "\`git pull\`"
+git daemon --export-all --base-path="$(pwd)"
--- a/hss-distributed-client.maxpat
+++ b/hss-distributed-client.maxpat
--- a/hss-distributed-server.maxpat
+++ b/hss-distributed-server.maxpat
--- a/hss.piecemaker.js
+++ b/hss.piecemaker.js
@@ -3,9 +3,11 @@ outlets = 4;

 var jpieces = {};
 var presets = [];
+var filename = "";
+var currentPiece = "";
 var hsspiece = {};
 var outdict = new Dict("HSSPieces");;
-var points = [[0.5, 0.5], [1., 0.], [1., 1.], [0., 1.], [0., 0.]];
+var points = [[0.5, 0.5], [0., 1.], [1., 1.], [1., 0.], [0., 0.]];
 var net = new Dict;
 var title;
 var DJsterParams = {
@@ -38,6 +40,12 @@ function dictionary(d)
 	net.name = d;
 	hsspiece[title]["networkData"] = JSON.parse(net.stringify()); 
 	outdict.parse(JSON.stringify(hsspiece));
+	jpieces = JSON.parse(outdict.stringify());
+	this.patcher.getnamed("currentPiece").message("clear");
+	for (var i = 0; i < Object.keys(jpieces).length; i++) this.patcher.getnamed("currentPiece").message("append", Object.keys(jpieces)[i]);
+	this.patcher.getnamed("currentPiece").message("set", Object.keys(jpieces).length - 1);
+	this.patcher.getnamed("currentPiece").message("clearchecks");
+	this.patcher.getnamed("currentPiece").message("checkitem", Object.keys(jpieces).length - 1, 1);
 	//outlet(0, "dictionary", outdict.name);
 }

@@ -52,13 +60,20 @@ function readPiece(path)
 	outlet(0, 0.5, 0.5);
 }

-function getSection(section)
+function setDict()
+{
+	jpieces = JSON.parse(outdict.stringify());
+}
+
+function setSection(section)
 {
 	if (outdict.contains(section)) {
-		outlet(1, outdict.get(section + "::1::networkData"));
+		var networkData = outdict.get(section + "::networkData");
+		outlet(1, "set_weights", "dictionary", networkData.name);
 		outlet(1, "predict", 0.5, 0.5);
 		outlet(0, 0.5, 0.5);
 	}
+	currentPiece = section;
 }

 function writePiece()
@@ -66,6 +81,7 @@ function writePiece()
 	outdict.export_json(this.patcher.filepath + "HSSPiece.json");
 }

+/*
 function anything()
 {
 	var filenames = arrayfromargs(messagename, arguments);
@@ -112,17 +128,68 @@ function anything()
 		outlet(1, "train", 10000);
 	}
 }
+*/
+
+function setPresetFile(f)
+{
+	filename = f;
+	currentPiece = filename.slice(filename.lastIndexOf("/") + 1, filename.lastIndexOf("."));
+}
+
+function train()
+{
+		presets = new Dict;
+		presets.import_json(filename);
+		title = currentPiece;
+		hsspiece[title] = {};
+		var slots = presets.get("pattrstorage::slots").getkeys();//number of slots here
+		outlet(1, "clear_data");
+		for (var j = 0; j < slots.length; j++){
+			hsspiece[title][j + 1] = {};
+			var trainingData = [];
+			var data = JSON.parse(presets.get("pattrstorage::slots::" + (j + 1) + "::data").stringify());
+			for (var p = 0; p < 4; p++) {
+				delete data["Djster.µbus[" + p + "]::scales"];
+				delete data["Djster.µbus[" + p + "]::meters"];
+				for (var param in DJsterParams) {
+					var val = data["Djster.µbus[" + p + "]::" + param];
+					switch (DJsterParams[param][2]) {
+						case "linear" :
+						trainingData.push(scale(val, DJsterParams[param][0], DJsterParams[param][1], 0., 1.));
+						break;
+						case "log" :
+						trainingData.push(scale(val, DJsterParams[param][0], DJsterParams[param][1], 0., 1.));
+						break;
+						case "enum" :
+						trainingData.push(j/5);
+						break;
+							}
+						post("param", param, trainingData, "\n");
+						}
+				//var val = data["hub::instrument::instrument-" + (p + 1)];
+				trainingData.push(j/5);
+				var val = data["hub::src::src" + (p + 1)];
+				trainingData.push(scale(val[0], 0, 127, 0., 1.));
+				trainingData.push(scale(val[1], 0, 127, 0., 1.));
+				}
+			//post("data", JSON.stringify(data), "\n");
+			hsspiece[title][j + 1] = data; 
+			outlet(1, "data_point", points[j].concat(trainingData));
+		}
+		outlet(1, "train", 10000);
+}
+

 function list()
 {
+	//post("jpieces", Object.keys(jpieces), "\n");
 	var vector = arrayfromargs(arguments);
 	var src = [];
-	var currentPiece = this.patcher.getnamed("currentPiece").getvalueof();
+	//currentPiece = this.patcher.getnamed("currentPiece").getvalueof();
 	var keys = Object.keys(DJsterParams);
 	for (var i = 0; i < 4; i++) {
 		for (var j = 0; j < vector.length/4; j++) {
 			var k = j + i * vector.length/4;
-			//post("vector", j, "\n");
 			switch (j) {
 				case 3 : //log
 				case 17 :
@@ -131,7 +198,7 @@ function list()
 				break;
 				case 13 : //enum
 				//val = "Major";
-				post(vector[k], Math.floor(vector[k]/0.2 + 1), "\n");
+				//post(vector[k], Math.floor(vector[k]/0.2 + 1), "\n");
 				outlet(2, "Djster.µbus[" + i + "]::" + keys[j], jpieces[currentPiece][parseInt(vector[k]/0.2 + 1)]["Djster.µbus[" + i + "]::scale"]);
 				break;
 				case 16 :
@@ -142,6 +209,10 @@ function list()
 				//val = "4"
 				outlet(2, "Djster.µbus[" + i + "]::" + keys[j], jpieces[currentPiece][parseInt(vector[k]/0.2 + 1)]["Djster.µbus[" + i + "]::timesig_denominator"]);
 				break;
+				case 20 :
+				//tonic pitch
+				outlet(2, "Djster.µbus[" + i + "]::" + keys[j], jpieces[currentPiece][parseInt(vector[k]/0.2 + 1)]["Djster.µbus[" + i + "]::tonic_pitch"]);
+				break;
 				case 21 :
 				val = "4"
 				outlet(2, "hub::instrument::instrument-" + (i + 1), jpieces[currentPiece][parseInt(vector[k]/0.2 + 1)]["hub::instrument::instrument-" + (i + 1)]);
Author	SHA1	Message	Date
Xiao Fu	3fba618c28	Merge branch 'main' of ssh://213.61.58.36:2222/kieran-mcauliffe/healing-soundscapes	2024-11-26 19:52:46 +01:00
Xiao Fu	20a91d9b6c	Create hss-Xiao-2024-3.json	2024-11-26 19:52:31 +01:00
computermusik	b0573b6558	Instrument names fixed	2024-11-26 12:48:26 +01:00
computermusik	fb858b81e9	Merge branch 'main' of ssh://213.61.58.36:2222/kieran-mcauliffe/healing-soundscapes	2024-11-25 21:35:48 +01:00
computermusik	cecb0d40af	More NN	2024-11-25 21:35:34 +01:00
MeiyanChen	9e7ff70722	Update Hss Chen Presets	2024-11-25 10:04:24 +01:00
beller	2ff530e072	NEw version of greg's piece	2024-11-20 10:43:00 +01:00
computermusik	a13f31d834	Merge branch 'main' of ssh://213.61.58.36:2222/kieran-mcauliffe/healing-soundscapes	2024-11-18 11:30:33 +01:00
computermusik	e274b86fa6	Implementation of NN training	2024-11-18 11:30:31 +01:00
Kieran	56d8b572a6	script for daemon distribution of repo	2024-10-17 13:14:22 +02:00
MeiyanChen	89c6ceb0bf	Update Hss Chen Presets	2024-10-11 16:55:00 +02:00
beller	a884d1d8ba	Correct manually instruments. linked to issue #24	2024-10-10 17:19:57 +02:00
beller	8bd04982c6	packed in one file	2024-10-10 12:52:11 +02:00
beller	1a8d60b770	presets packed in one json file	2024-10-10 12:51:19 +02:00
Kieran McAuliffe	a024af0899	greg presets	2024-10-08 15:51:57 +02:00
Kieran McAuliffe	578f830769	Revert "First versions" This reverts commit `82e5e08fee`.	2024-10-08 15:44:29 +02:00
gregbeller	82e5e08fee	First versions	2024-10-08 11:25:09 +02:00
MeiyanChen	df4479f758	Update Hss Chen Presets	2024-10-06 17:23:18 +02:00
MeiyanChen	6310f88472	Update Hss Chen Presets	2024-10-06 17:20:46 +02:00
MeiyanChen	cfcb1046a7	Update Hss Chen Presets	2024-10-06 12:31:21 +02:00
MeiyanChen	213164f5e5	Update Hss Chen Presets	2024-10-06 12:22:43 +02:00
MeiyanChen	77107e6495	Change name of old preset	2024-10-06 12:05:35 +02:00
MeiyanChen	4bbf1fef53	Update Presets/Hss-Chen-Preset-2.json	2024-10-06 12:00:15 +02:00
computermusik	0c63552b10	Merge branch 'main' of ssh://213.61.58.36:2222/kieran-mcauliffe/healing-soundscapes	2024-10-04 16:16:07 +02:00
computermusik	3c52af363e	Xiao's presets	2024-10-04 16:16:05 +02:00