Skip to content

Commit 55a902b

Browse files
tremblaptremblap
authored
Merge pull request #79 from flucoma/dev
[release] 1.0.5
2 parents d35a607 + e5bf15a commit 55a902b

13 files changed

+1355
-848
lines changed

‎.github/workflows/nightly.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
path: release-packaging/FluCoMa-PD-Windows-nightly.zip
5757

5858
linuxbuild:
59-
runs-on: ubuntu-latest
59+
runs-on: ubuntu-20.04
6060
steps:
6161
- uses: actions/checkout@v3
6262
- uses: flucoma/actions/env@main
@@ -74,7 +74,7 @@ jobs:
7474
path: release-packaging/FluCoMa-PD-Linux-nightly.tar.gz
7575

7676
release:
77-
runs-on: ubuntu-latest
77+
runs-on: ubuntu-20.04
7878
needs: [macbuild, winbuild, linuxbuild]
7979

8080
steps:

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
path: release-packaging/FluCoMa-PD-Windows.zip
5050

5151
linuxbuild:
52-
runs-on: ubuntu-latest
52+
runs-on: ubuntu-20.04
5353
outputs:
5454
version: ${{ steps.get-version.outputs.version }}
5555
steps:
@@ -73,7 +73,7 @@ jobs:
7373
working-directory: build/_deps/flucoma-core-src
7474

7575
release:
76-
runs-on: ubuntu-latest
76+
runs-on: ubuntu-20.04
7777
needs: [macbuild, winbuild, linuxbuild]
7878

7979
steps:

‎FluidCorpusManipulationOverview.pd‎

Lines changed: 87 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#N struct 1110-draw-item float x float y float c float a float b;
2-
#N struct 1014-rectangle float x float c;
3-
#N struct 1014-pixel float x0 float y0 float x1 float y1;
1+
#N struct 1080-rectangle float x float c;
2+
#N struct 1080-pixel float x0 float y0 float x1 float y1;
43
#N canvas 0 23 705 811 12;
54
#X obj 285 237 fluid.ampslice~;
65
#X obj 285 147 fluid.onsetslice~;
@@ -12,22 +11,14 @@
1211
#X obj 494 177 fluid.buftransientslice;
1312
#X obj 285 267 fluid.ampgate~;
1413
#X obj 494 267 fluid.bufampgate;
15-
#X obj 17 13 cnv 15 660 42 empty empty Fluid\\\ Corpus\\\ Manipulation
16-
1 22 0 36 #4ba3fb #ffffff 0;
17-
#X obj 17 60 cnv 15 488 17 empty empty Analyse\\\ Transform\\\ and\\\ Learn\\\ from\\\ Sounds
18-
4 8 0 13 #e0e0e0 #404040 0;
19-
#X obj 17 111 cnv 15 240 20 empty empty Slice\\\ Audio 4 10 0 16 #e0e0e0
20-
#404040 0;
21-
#X obj 17 341 cnv 15 240 20 empty empty Analyse\\\ Audio 4 10 0 16
22-
#e0e0e0 #404040 0;
23-
#X obj 16 785 cnv 15 240 20 empty empty Decompose\\\ Audio 4 10 0 16
24-
#e0e0e0 #404040 0;
25-
#X obj 16 985 cnv 15 240 20 empty empty Transform\\\ Audio 4 10 0 16
26-
#e0e0e0 #404040 0;
27-
#X obj 16 1185 cnv 15 240 20 empty empty Analyse\\\ Data 4 10 0 16
28-
#e0e0e0 #404040 0;
29-
#X obj 19 1572 cnv 15 240 20 empty empty Helpers 4 10 0 16 #e0e0e0
30-
#404040 0;
14+
#X obj 17 13 cnv 15 660 42 empty empty Fluid\ Corpus\ Manipulation 1 22 0 36 #4ba3fb #ffffff 0;
15+
#X obj 17 60 cnv 15 488 17 empty empty Analyse\ Transform\ and\ Learn\ from\ Sounds 4 8 0 13 #e0e0e0 #404040 0;
16+
#X obj 17 111 cnv 15 240 20 empty empty Slice\ Audio 4 10 0 16 #e0e0e0 #404040 0;
17+
#X obj 17 341 cnv 15 240 20 empty empty Analyse\ Audio 4 10 0 16 #e0e0e0 #404040 0;
18+
#X obj 16 794 cnv 15 240 20 empty empty Decompose\ Audio 4 10 0 16 #e0e0e0 #404040 0;
19+
#X obj 16 1015 cnv 15 240 20 empty empty Transform\ Audio 4 10 0 16 #e0e0e0 #404040 0;
20+
#X obj 16 1215 cnv 15 240 20 empty empty Analyse\ Data 4 10 0 16 #e0e0e0 #404040 0;
21+
#X obj 19 1602 cnv 15 240 20 empty empty Helpers 4 10 0 16 #e0e0e0 #404040 0;
3122
#X text 282 117 Signal In \, Signal Out;
3223
#X text 491 117 Array In \, Array Out;
3324
#X text 34 146 Spectral Difference-Based Slicer;
@@ -55,9 +46,9 @@
5546
#X obj 494 591 fluid.bufonsetfeature;
5647
#X obj 494 559 fluid.bufampfeature;
5748
#X obj 494 529 fluid.bufchroma;
58-
#X obj 284 651 fluid.nmfmatch~;
59-
#X obj 494 711 fluid.bufstft;
60-
#X obj 494 681 fluid.bufnmfseed;
49+
#X obj 284 681 fluid.nmfmatch~;
50+
#X obj 494 741 fluid.bufstft;
51+
#X obj 494 711 fluid.bufnmfseed;
6152
#X text 145 376 Pitch Descriptor;
6253
#X text 26 406 Loudness and True-Peak Descriptor;
6354
#X text 68 438 Spectral Contour Descriptor;
@@ -67,74 +58,77 @@
6758
#X text 40 558 Amplitude Detrending Descriptor;
6859
#X text 47 590 Spectral Difference Descriptor;
6960
#X text 131 620 Novelty Descriptor;
70-
#X text 12 650 Non-Negative Factorisation on Bases;
71-
#X text 61 710 Short-Time Fourier Transform;
72-
#X text 75 680 Non-Negative Decomposition;
73-
#X text 281 791 Signal In \, Signal Out;
74-
#X text 491 791 Array(s) In \, Array Out;
75-
#X obj 284 821 fluid.sines~;
76-
#X obj 494 821 fluid.bufsines;
77-
#X obj 284 851 fluid.transients~;
78-
#X obj 494 851 fluid.buftransients;
79-
#X obj 284 883 fluid.hpss~;
80-
#X obj 494 883 fluid.bufhpss;
81-
#X obj 494 913 fluid.bufnmf;
82-
#X text 23 910 Non-Negative Matrix Factorisation;
83-
#X text 121 848 Transient Extractor;
84-
#X text 2 817 Sinusoidal Modelling and Resynthesis;
85-
#X text 44 880 Harmonic-Percussive Separation;
86-
#X text 281 991 Signal In \, Signal Out;
87-
#X text 2 1017 Interpolate Between Sinusoidal Peaks;
88-
#X obj 284 1021 fluid.audiotransport~;
89-
#X obj 494 1021 fluid.bufaudiotransport;
90-
#X text 491 991 Array In \, Array Out;
91-
#X obj 284 1083 fluid.nmfmorph~;
92-
#X obj 284 1051 fluid.nmffilter~ 2;
93-
#X text 9 1048 Non-Negative Factorisation on Bases;
94-
#X text 93 1080 Morph Between NMF Bases;
95-
#X obj 494 1113 fluid.bufnmfcross;
96-
#X text 51 1110 Resynthesise a Target via NMF;
97-
#X text 5 1219 Containers: ID-associated Data/Label;
98-
#X text 5 1249 Statistical Analysis on Lists/Arrays;
99-
#X text 103 1281 Searching and Querying;
100-
#X text 166 1311 Preprocessing;
101-
#X text 68 1371 Supervised Machine Learning;
102-
#X text 53 1431 Unsupervised Machine Learning;
103-
#X obj 284 1220 fluid.dataset;
104-
#X obj 494 1220 fluid.labelset;
105-
#X obj 284 1250 fluid.stats;
106-
#X obj 494 1250 fluid.bufstats;
107-
#X obj 284 1282 fluid.kdtree;
108-
#X obj 494 1282 fluid.datasetquery;
109-
#X obj 284 1312 fluid.normalize;
110-
#X obj 284 1342 fluid.standardize;
111-
#X obj 493 1312 fluid.robustscale;
112-
#X obj 284 1372 fluid.knnregressor;
113-
#X obj 284 1402 fluid.mlpregressor;
114-
#X obj 494 1372 fluid.knnclassifier;
115-
#X obj 494 1402 fluid.mlpclassifier;
116-
#X obj 284 1432 fluid.pca;
117-
#X obj 284 1464 fluid.mds;
118-
#X obj 284 1494 fluid.umap;
119-
#X obj 494 1432 fluid.kmeans;
120-
#X text 69 1608 Corpus-Building Abstraction;
121-
#X obj 286 1609 fluid.concataudiofiles;
122-
#X text 153 1638 Array Utilities;
123-
#X obj 286 1639 fluid.bufcompose;
124-
#X obj 496 1639 fluid.bufscale;
125-
#X obj 286 1671 fluid.bufthresh;
126-
#X obj 496 1671 fluid.bufflatten;
127-
#X obj 286 1701 fluid.bufselect;
128-
#X obj 496 1701 fluid.bufselectevery;
129-
#X obj 494 1494 fluid.grid;
130-
#X obj 494 1464 fluid.skmeans;
131-
#X text 146 1879 Data-Viewing GUI;
132-
#X obj 286 1876 fluid.plotter;
133-
#X obj 286 1731 fluid.bufinfo;
134-
#X obj 286 1819 fluid.waveform 100 40 0 empty empty 0;
135-
#X text 118 1820 Waveform-Viewing GUI;
136-
#X obj 286 1790 fluid.s2f;
137-
#X obj 286 1762 fluid.ds2text;
138-
#X obj 496 1762 fluid.ls2text;
139-
#X text 77 1763 Dataset/Labelset Utilities;
140-
#X obj 496 1732 fluid.multiarray;
61+
#X text 12 680 Non-Negative Factorisation on Bases;
62+
#X text 61 740 Short-Time Fourier Transform;
63+
#X text 75 710 Non-Negative Decomposition;
64+
#X text 281 821 Signal In \, Signal Out;
65+
#X text 491 821 Array(s) In \, Array Out;
66+
#X obj 284 851 fluid.sines~;
67+
#X obj 494 851 fluid.bufsines;
68+
#X obj 284 881 fluid.transients~;
69+
#X obj 494 881 fluid.buftransients;
70+
#X obj 284 913 fluid.hpss~;
71+
#X obj 494 913 fluid.bufhpss;
72+
#X obj 494 943 fluid.bufnmf;
73+
#X text 23 940 Non-Negative Matrix Factorisation;
74+
#X text 121 878 Transient Extractor;
75+
#X text 2 847 Sinusoidal Modelling and Resynthesis;
76+
#X text 44 910 Harmonic-Percussive Separation;
77+
#X text 281 1021 Signal In \, Signal Out;
78+
#X text 2 1047 Interpolate Between Sinusoidal Peaks;
79+
#X obj 284 1051 fluid.audiotransport~;
80+
#X obj 494 1051 fluid.bufaudiotransport;
81+
#X text 491 1021 Array In \, Array Out;
82+
#X obj 284 1113 fluid.nmfmorph~;
83+
#X obj 284 1081 fluid.nmffilter~ 2;
84+
#X text 9 1078 Non-Negative Factorisation on Bases;
85+
#X text 93 1110 Morph Between NMF Bases;
86+
#X obj 494 1143 fluid.bufnmfcross;
87+
#X text 51 1140 Resynthesise a Target via NMF;
88+
#X text 5 1249 Containers: ID-associated Data/Label;
89+
#X text 5 1279 Statistical Analysis on Lists/Arrays;
90+
#X text 103 1311 Searching and Querying;
91+
#X text 166 1341 Preprocessing;
92+
#X text 68 1401 Supervised Machine Learning;
93+
#X text 53 1461 Unsupervised Machine Learning;
94+
#X obj 284 1250 fluid.dataset;
95+
#X obj 494 1250 fluid.labelset;
96+
#X obj 284 1280 fluid.stats;
97+
#X obj 494 1280 fluid.bufstats;
98+
#X obj 284 1312 fluid.kdtree;
99+
#X obj 494 1312 fluid.datasetquery;
100+
#X obj 284 1342 fluid.normalize;
101+
#X obj 284 1372 fluid.standardize;
102+
#X obj 493 1342 fluid.robustscale;
103+
#X obj 284 1402 fluid.knnregressor;
104+
#X obj 284 1432 fluid.mlpregressor;
105+
#X obj 494 1402 fluid.knnclassifier;
106+
#X obj 494 1432 fluid.mlpclassifier;
107+
#X obj 284 1462 fluid.pca;
108+
#X obj 284 1494 fluid.mds;
109+
#X obj 284 1524 fluid.umap;
110+
#X obj 494 1462 fluid.kmeans;
111+
#X text 69 1638 Corpus-Building Abstraction;
112+
#X obj 286 1639 fluid.concataudiofiles;
113+
#X text 153 1668 Array Utilities;
114+
#X obj 286 1669 fluid.bufcompose;
115+
#X obj 496 1669 fluid.bufscale;
116+
#X obj 286 1701 fluid.bufthresh;
117+
#X obj 496 1701 fluid.bufflatten;
118+
#X obj 286 1731 fluid.bufselect;
119+
#X obj 496 1731 fluid.bufselectevery;
120+
#X obj 494 1524 fluid.grid;
121+
#X obj 494 1494 fluid.skmeans;
122+
#X text 146 1909 Data-Viewing GUI;
123+
#X obj 286 1906 fluid.plotter;
124+
#X obj 286 1761 fluid.bufinfo;
125+
#X obj 286 1849 fluid.waveform 100 40 0 empty empty 0;
126+
#X text 118 1850 Waveform-Viewing GUI;
127+
#X obj 286 1820 fluid.s2f;
128+
#X obj 286 1792 fluid.ds2text;
129+
#X obj 496 1792 fluid.ls2text;
130+
#X text 77 1793 Dataset/Labelset Utilities;
131+
#X obj 496 1762 fluid.multiarray;
132+
#X text 68 650 Sinusoidal Peaks Descriptor;
133+
#X obj 284 651 fluid.sinefeature~;
134+
#X obj 494 651 fluid.bufsinefeature;

‎examples/array_compositing/bufcomposemacros.pd‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@
1313
#X obj 58 371 expr sin($f1 * 3);
1414
#X obj 42 422 expr sin($f1 / 0.2 * 3);
1515
#X obj 40 106 t f b b;
16-
#X msg 122 111 \; bufmacro_low-0 resize 100 \, const \; bufmacro_low-1
17-
resize 100 \, const \; bufmacro_mid-0 resize 100 \, const \; bufmacro_mid-1
18-
resize 100 \, const \; bufmacro_high-0 resize 100 \, const \; bufmacro_high-1
19-
resize 100 \, const;
16+
#X msg 122 111 \; bufmacro_low-0 resize 100 \, const \; bufmacro_low-1 resize 100 \, const \; bufmacro_mid-0 resize 100 \, const \; bufmacro_mid-1 resize 100 \, const \; bufmacro_high-0 resize 100 \, const \; bufmacro_high-1 resize 100 \, const;
2017
#X obj 122 63 inlet;
2118
#X obj 72 340 tabwrite bufmacro_low-0;
2219
#X obj 58 392 tabwrite bufmacro_mid-0;
@@ -42,11 +39,9 @@ resize 100 \, const;
4239
#X connect 10 2 11 0;
4340
#X connect 12 0 6 0;
4441
#X restore 26 217 pd generate_basic_waveforms;
45-
#X obj 26 195 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
46-
-1;
42+
#X obj 26 195 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000 #000000;
4743
#X text 56 194 1) click here to reset to the basic shapes;
48-
#X text 34 303 2) try the new macros! They all take a list of (fluid.multi)arrays
49-
as arguments \, and will update the first item., f 112;
44+
#X text 34 303 2) try the new macros! They all take a list of (fluid.multi)arrays as arguments \, and will update the first item., f 112;
5045
#X text 562 61 3) view the arrays to monitor the results;
5146
#X text 37 361 Concat juxtaposes the whole list in time;
5247
#X text 444 362 Merge mixes them at unity gain;
@@ -62,10 +57,8 @@ as arguments \, and will update the first item., f 112;
6257
#X msg 72 451 concat bufmacro_piano bufmacro_low;
6358
#X obj 563 83 array define bufmacro_piano-0 4410;
6459
#X obj 563 104 array define bufmacro_piano-1 4410;
65-
#X msg 25 90 read ../../help/media/Tremblay-SA-UprightPianoPedalWide.wav
66-
bufmacro_piano-0 bufmacro_piano-1;
67-
#X obj 41 497 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144 -1
68-
-1;
60+
#X msg 25 90 read ../../help/media/Tremblay-SA-UprightPianoPedalWide.wav bufmacro_piano-0 bufmacro_piano-1;
61+
#X obj 41 497 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000 #000000;
6962
#N canvas 290 104 780 584 concat 0;
7063
#X obj 365 336 outlet;
7164
#X obj 36 111 list split 1;
@@ -88,8 +81,7 @@ bufmacro_piano-0 bufmacro_piano-1;
8881
#X msg 124 486 source \$1;
8982
#X obj 229 398 t b s b;
9083
#X text 136 110 splits the destination;
91-
#X text 394 313 iterates through the rest of arrays \, bangs when done
92-
;
84+
#X text 394 313 iterates through the rest of arrays \, bangs when done;
9385
#X obj 36 33 inlet;
9486
#X obj 36 58 route concat;
9587
#X connect 1 0 2 0;
@@ -123,8 +115,7 @@ bufmacro_piano-0 bufmacro_piano-1;
123115
#X connect 22 0 23 0;
124116
#X connect 23 0 5 0;
125117
#X restore 41 475 pd concat;
126-
#X obj 446 500 bng 15 250 50 0 empty empty empty 17 7 0 10 -262144
127-
-1 -1;
118+
#X obj 446 500 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000 #000000;
128119
#N canvas 290 104 780 584 merge 0;
129120
#X obj 365 336 outlet;
130121
#X obj 36 111 list split 1;
@@ -143,8 +134,7 @@ bufmacro_piano-0 bufmacro_piano-1;
143134
#X msg 17 285 destination \$1;
144135
#X msg 124 486 source \$1;
145136
#X text 136 110 splits the destination;
146-
#X text 394 313 iterates through the rest of arrays \, bangs when done
147-
;
137+
#X text 394 313 iterates through the rest of arrays \, bangs when done;
148138
#X obj 36 33 inlet;
149139
#X obj 36 58 route merge;
150140
#X obj 229 398 t b s;
@@ -180,9 +170,8 @@ bufmacro_piano-0 bufmacro_piano-1;
180170
#X msg 463 432 merge bufmacro_mid bufmacro_piano bufmacro_low;
181171
#X msg 451 408 merge bufmacro_mid bufmacro_low bufmacro_high;
182172
#X msg 445 386 merge bufmacro_low bufmacro_mid;
183-
#X text 247 602 Stack would piles them up in as many channels as it
184-
would need \, but there is no programatic ways to recover the number
185-
of 'channels' of a fluid.multiarray...;
173+
#X text 247 602 Stack would piles them up in as many channels as it would need \, but there is no programatic ways to augment the number of 'channels' of a fluid.multiarray... one would need to create a dynamic output using the automatic_multiarray. See this helpfile to understand their use:;
174+
#X obj 519 665 fluid.bufinfo;
186175
#X connect 0 0 21 0;
187176
#X connect 3 0 2 0;
188177
#X connect 15 0 23 0;

0 commit comments

Comments
 (0)