Skip to content

Commit

Permalink
Merge branch 'main' into dev-joe
Browse files Browse the repository at this point in the history
  • Loading branch information
jpsteccato committed Dec 15, 2023
2 parents ead8017 + 122e627 commit 1fd524d
Show file tree
Hide file tree
Showing 11 changed files with 1,274 additions and 1,277 deletions.
415 changes: 204 additions & 211 deletions extras/ppooll_host.maxpat

Large diffs are not rendered by default.

60 changes: 30 additions & 30 deletions misc/ppooll_factory_presets/2DslidersT/default.json
Original file line number Diff line number Diff line change
@@ -1,44 +1,50 @@
{
"window" : [ 851, 558, 977, 621 ],
"window" : [ 807, 481, 1037, 558 ],
"function" : {
"patching_rect" : [ 205, 59, 31, 20 ],
"hidden" : 0,
"fontsize" : 10
}
,
"preset-ramp" : {
"patching_rect" : [ 154, 0, 50, 14 ],
"hidden" : 1,
"hidden" : 0,
"fontsize" : 12
}
,
"presets" : {
"patching_rect" : [ 76, 0, 79, 14 ],
"hidden" : 1,
"hidden" : 0,
"jsarguments" : [ 12, "255 255 255", "50 50 50", "255 0 0", "0 255 0", "2Dsliders1" ]
}
,
"grid" : {
"patching_rect" : [ 102, 31, 28, 15 ],
"hidden" : 1,
"hidden" : 0,
"fontsize" : 11
}
,
"ally0" : {
"patching_rect" : [ 132, 46, 34, 15 ],
"hidden" : 1,
"hidden" : 0,
"fontsize" : 12
}
,
"def_colors" : {
"patching_rect" : [ 63, 31, 40, 15 ],
"hidden" : 1,
"hidden" : 0,
"fontsize" : 12
}
,
"def_grid" : {
"patching_rect" : [ 128, 31, 52, 15 ],
"hidden" : 1,
"hidden" : 0,
"fontsize" : 12
}
,
"show_window" : {
"patching_rect" : [ 125, 16, 48, 15 ],
"hidden" : 1,
"hidden" : 0,
"fontsize" : 11
}
,
Expand Down Expand Up @@ -67,85 +73,85 @@
}
,
"w_titlebar" : {
"patching_rect" : [ 173, 16, 48, 15 ],
"hidden" : 1,
"patching_rect" : [ 174, 16, 48, 15 ],
"hidden" : 0,
"fontsize" : 12
}
,
"amount" : {
"patching_rect" : [ 0, 31, 32, 15 ],
"hidden" : 1,
"hidden" : 0,
"fontsize" : 9.5
}
,
"scale" : {
"patching_rect" : [ 31, 31, 32, 15 ],
"hidden" : 1,
"hidden" : 0,
"fontsize" : 9.5
}
,
"selected" : {
"patching_rect" : [ 0, 46, 32, 15 ],
"hidden" : 1,
"hidden" : 0,
"fontsize" : 9.5
}
,
"current_x" : {
"patching_rect" : [ 31, 46, 32, 15 ],
"hidden" : 1,
"hidden" : 0,
"fontsize" : 9.5
}
,
"current_y" : {
"patching_rect" : [ 62, 46, 32, 15 ],
"hidden" : 1,
"hidden" : 0,
"fontsize" : 9.5
}
,
"spread" : {
"patching_rect" : [ 165, 46, 44, 15 ],
"hidden" : 1,
"hidden" : 0,
"fontsize" : 11
}
,
"set_current" : {
"patching_rect" : [ 94, 46, 39, 15 ],
"hidden" : 1,
"hidden" : 0,
"fontsize" : 12
}
,
"auto" : {
"patching_rect" : [ 0, 31, 31, 15 ],
"patching_rect" : [ 0, 61, 31, 15 ],
"hidden" : 0,
"fontsize" : 11
}
,
"alt_grid" : {
"patching_rect" : [ 178, 31, 52, 15 ],
"hidden" : 1,
"hidden" : 0,
"fontsize" : 12
}
,
"ctrl-time" : {
"patching_rect" : [ 0, 47, 101, 15 ],
"patching_rect" : [ 102, 61, 58, 15 ],
"hidden" : 0,
"fontsize" : 12
}
,
"auto_time" : {
"patching_rect" : [ 31, 31, 93, 15 ],
"patching_rect" : [ 28, 61, 75, 15 ],
"hidden" : 0,
"fontsize" : 12
}
,
"zoomreset" : {
"patching_rect" : [ 67, 0, 46, 15 ],
"patching_rect" : [ 161, 61, 46, 15 ],
"hidden" : 0,
"fontsize" : 12
}
,
"ZH" : {
"patching_rect" : [ 205, 0, 15, 15 ],
"patching_rect" : [ 205, 46, 15, 15 ],
"hidden" : 0,
"fontsize" : 12
}
Expand All @@ -155,15 +161,9 @@
"patching_rect" : [ 180, 162, 50, 22 ],
"hidden" : 1
}
,
"function" : {
"patching_rect" : [ 180, 59, 46, 20 ],
"hidden" : 0,
"fontsize" : 10
}
,
"alt" : {
"patching_rect" : [ 102, 46, 21, 18 ],
"patching_rect" : [ 205, 0, 21, 18 ],
"hidden" : 0,
"fontsize" : 11
}
Expand Down
60 changes: 31 additions & 29 deletions misc/ppooll_factory_presets/environmentsP/ducks.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion misc/ppooll_factory_presets/sinsET/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@
"fontsize" : 12
}
,
"recent_index" : {
"recent_index_display" : {
"patching_rect" : [ 688, 67, 168, 20 ],
"hidden" : 0,
"fontsize" : 11
Expand Down
31 changes: 16 additions & 15 deletions misc/ppooll_factory_presets/snap@P/ducks.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"id" : 2,
"data" : {
"next" : [ -1 ],
"select_acts" : [ 2 ],
"select_acts" : [ 0 ],
"presets" : [ 16.0 ],
"preset-ramp" : [ 0 ],
"title_menu" : [ "subpatch" ],
Expand All @@ -40,7 +40,7 @@
"id" : 3,
"data" : {
"next" : [ -1 ],
"select_acts" : [ 2 ],
"select_acts" : [ 0 ],
"presets" : [ 16.0 ],
"preset-ramp" : [ 0 ],
"title_menu" : [ "subpatch" ],
Expand All @@ -57,7 +57,7 @@
"id" : 4,
"data" : {
"next" : [ -1 ],
"select_acts" : [ 2 ],
"select_acts" : [ 0 ],
"presets" : [ 2 ],
"preset-ramp" : [ 0 ],
"title_menu" : [ "subpatch" ],
Expand All @@ -74,7 +74,7 @@
"id" : 5,
"data" : {
"next" : [ -1 ],
"select_acts" : [ 2 ],
"select_acts" : [ 0 ],
"presets" : [ 3.0 ],
"preset-ramp" : [ 0 ],
"title_menu" : [ "subpatch" ],
Expand All @@ -91,7 +91,7 @@
"id" : 6,
"data" : {
"next" : [ -1 ],
"select_acts" : [ 2 ],
"select_acts" : [ 0 ],
"presets" : [ 6.0 ],
"preset-ramp" : [ 0 ],
"title_menu" : [ "subpatch" ],
Expand All @@ -108,7 +108,7 @@
"id" : 7,
"data" : {
"next" : [ -1 ],
"select_acts" : [ 2 ],
"select_acts" : [ 0 ],
"presets" : [ 6.0 ],
"preset-ramp" : [ 0 ],
"title_menu" : [ "subpatch" ],
Expand All @@ -125,7 +125,7 @@
"id" : 8,
"data" : {
"next" : [ -1 ],
"select_acts" : [ 2 ],
"select_acts" : [ 0 ],
"presets" : [ 7.0 ],
"preset-ramp" : [ 0 ],
"title_menu" : [ "subpatch" ],
Expand All @@ -142,7 +142,7 @@
"id" : 9,
"data" : {
"next" : [ -1 ],
"select_acts" : [ 2 ],
"select_acts" : [ 0 ],
"presets" : [ 8.0 ],
"preset-ramp" : [ 0 ],
"title_menu" : [ "subpatch" ],
Expand All @@ -159,7 +159,7 @@
"id" : 10,
"data" : {
"next" : [ -1 ],
"select_acts" : [ 2 ],
"select_acts" : [ 0 ],
"presets" : [ 3.0 ],
"preset-ramp" : [ 0 ],
"title_menu" : [ "subpatch" ],
Expand All @@ -176,7 +176,7 @@
"id" : 11,
"data" : {
"next" : [ -1 ],
"select_acts" : [ 2 ],
"select_acts" : [ 0 ],
"presets" : [ 16.0 ],
"preset-ramp" : [ 0 ],
"title_menu" : [ "subpatch" ],
Expand All @@ -193,7 +193,7 @@
"id" : 12,
"data" : {
"next" : [ -1 ],
"select_acts" : [ 2 ],
"select_acts" : [ 0 ],
"presets" : [ 13.0 ],
"preset-ramp" : [ 0 ],
"title_menu" : [ "subpatch" ],
Expand All @@ -210,7 +210,7 @@
"id" : 13,
"data" : {
"next" : [ -1 ],
"select_acts" : [ 2 ],
"select_acts" : [ 0 ],
"presets" : [ 5.0 ],
"preset-ramp" : [ 0 ],
"title_menu" : [ "subpatch" ],
Expand All @@ -227,7 +227,7 @@
"id" : 14,
"data" : {
"next" : [ -1 ],
"select_acts" : [ 2 ],
"select_acts" : [ 0 ],
"presets" : [ 8.0 ],
"preset-ramp" : [ 0 ],
"title_menu" : [ "subpatch" ],
Expand All @@ -244,7 +244,7 @@
"id" : 15,
"data" : {
"next" : [ -1 ],
"select_acts" : [ 2 ],
"select_acts" : [ 0 ],
"presets" : [ 15.0 ],
"preset-ramp" : [ 0 ],
"title_menu" : [ "subpatch" ],
Expand All @@ -261,7 +261,7 @@
"id" : 16,
"data" : {
"next" : [ -1 ],
"select_acts" : [ 2 ],
"select_acts" : [ 0 ],
"presets" : [ 16.0 ],
"preset-ramp" : [ 0 ],
"title_menu" : [ "subpatch" ],
Expand Down Expand Up @@ -295,6 +295,7 @@
,
"clientstate" : {
"active" : {
"select_acts" : 0,
"presets" : 0,
"preset-ramp" : 0,
"title_menu" : 0,
Expand Down
Loading

0 comments on commit 1fd524d

Please sign in to comment.