Skip to content

Commit 210c663

Browse files
tremblaptremblap
authored
Merge pull request #88 from flucoma/pre-production
1.0.6 preprod to prod
2 parents efe7991 + 98e59d9 commit 210c663

12 files changed

+241
-457
lines changed

‎.github/workflows/release.yml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- uses: flucoma/actions/env@main
1111
- uses: flucoma/actions/pd@v5
1212
with:
13-
branch: origin/production
13+
branch: origin/${{ github.ref_name }}
1414

1515
- name: sign binaries
1616
uses: flucoma/actions/distribution@main
@@ -37,7 +37,7 @@ jobs:
3737
- uses: flucoma/actions/env@main
3838
- uses: flucoma/actions/pd@v5
3939
with:
40-
branch: origin/production
40+
branch: origin/${{ github.ref_name }}
4141

4242
- name: compress archive
4343
run: 7z a FluCoMa-PD-Windows.zip FluidCorpusManipulation
@@ -57,7 +57,7 @@ jobs:
5757
- uses: flucoma/actions/env@main
5858
- uses: flucoma/actions/pd@v5
5959
with:
60-
branch: origin/production
60+
branch: origin/${{ github.ref_name }}
6161

6262
- name: compress archive
6363
run: tar -zcvf FluCoMa-PD-Linux.tar.gz FluidCorpusManipulation
@@ -69,7 +69,7 @@ jobs:
6969
path: release-packaging/FluCoMa-PD-Linux.tar.gz
7070

7171
- id: get-version
72-
run: echo "::set-output name=version::$(cat flucoma.version.rc)"
72+
run: echo "version=$(cat flucoma.version.rc)" >> $GITHUB_OUTPUT
7373
working-directory: build/_deps/flucoma-core-src
7474

7575
release:
@@ -92,6 +92,14 @@ jobs:
9292
with:
9393
name: winbuild
9494

95+
- name: delete pre-existing release
96+
uses: dev-drprasad/[email protected]
97+
with:
98+
delete_release: true # default: false
99+
tag_name: ${{ needs.linuxbuild.outputs.version }} # tag name to delete
100+
env:
101+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
102+
95103
- name: package and upload
96104
uses: softprops/action-gh-release@v1
97105
with:
@@ -100,4 +108,5 @@ jobs:
100108
files: FluCoMa*
101109
prerelease: true
102110
tag_name: ${{ needs.linuxbuild.outputs.version }}
111+
target_commitish: ${{ github.sha }}
103112
draft: false

‎help/fluid.box.pd‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#N canvas 1522 -1046 1163 822 12;
2-
#X obj 101 101 cnv 15 40 40 empty \$0-col empty 20 12 0 14 #e3e38e
3-
#fcfcfc 0;
1+
#N canvas 143 148 1163 822 12;
2+
#X obj 101 101 cnv 15 40 40 empty \$0-col empty 20 12 0 14 #e3e3e3 #fcfcfc 0;
43
#X obj 220 83 inlet;
54
#X obj 220 726 s \$0-col;
65
#X obj 392 543 makefilename %02x;

‎help/fluid.bufmelbands.polyoscil.pd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#N canvas 938 -980 745 649 12;
1+
#N canvas 68 141 745 649 12;
22
#X obj 409 31 inlet;
33
#X obj 409 121 osc~ 1;
44
#X obj 176 31 loadbang;

‎help/fluid.bufpitch.grain.pd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#N canvas 1902 -790 600 443 10;
1+
#N canvas 143 206 600 443 10;
22
#X obj 31 39 inlet;
33
#X obj 31 59 t f b;
44
#X obj 32 232 *~;

‎help/fluid.bufspectralshape-help.pd‎

Lines changed: 35 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
#N canvas 8 41 700 728 12;
2-
#X obj 17 13 cnv 15 660 42 empty empty fluid.bufspectralshape 1 22
3-
0 36 #4ba3fb #ffffff 0;
4-
#X obj 465 592 cnv 15 215 110 empty empty More\\\ information 4 10
5-
0 13 #e0e0e0 #404040 0;
6-
#X obj 509 60 fluid.referencelauncher fluid.bufspectralshape.html reference/bufspectralshape/
7-
;
8-
#X obj 17 60 cnv 15 488 17 empty empty Seven\\\ Spectral\\\ Shape\\\ Descriptors\\\ on\\\ a\\\ Buffer
9-
4 8 0 13 #e0e0e0 #404040 0;
10-
#X text 17 79 Seven of the spectral shape descriptors \, computed on
11-
a linear scale for both amplitude and frequency.;
2+
#X obj 17 13 cnv 15 660 42 empty empty fluid.bufspectralshape 1 22 0 36 #4ba3fb #ffffff 0;
3+
#X obj 465 592 cnv 15 215 110 empty empty More\ information 4 10 0 13 #e0e0e0 #404040 0;
4+
#X obj 509 60 fluid.referencelauncher fluid.bufspectralshape.html reference/bufspectralshape/;
5+
#X obj 17 60 cnv 15 488 17 empty empty Seven\ Spectral\ Shape\ Descriptors\ on\ a\ Buffer 4 8 0 13 #e0e0e0 #404040 0;
6+
#X text 17 79 Seven of the spectral shape descriptors \, computed on a linear scale for both amplitude and frequency.;
127
#N canvas 119 59 706 918 layout_of_results 0;
13-
#X obj 17 13 cnv 15 660 42 empty empty fluid.bufspectralshape 1 22
14-
0 36 #4ba3fb #ffffff 0;
15-
#X text 17 79 fluid.bufspectralshape~ outputs its results to a buffer
16-
where each channel is a different descriptor and each "frame" is a
17-
window of spectral analysis.;
8+
#X obj 17 13 cnv 15 660 42 empty empty fluid.bufspectralshape 1 22 0 36 #4ba3fb #ffffff 0;
9+
#X text 17 79 fluid.bufspectralshape~ outputs its results to a buffer where each channel is a different descriptor and each "frame" is a window of spectral analysis.;
1810
#N canvas 1955 -858 448 179 loadsrc 0;
1911
#X obj 16 83 soundfiler;
2012
#X obj 16 19 inlet;
@@ -26,22 +18,17 @@ window of spectral analysis.;
2618
#X connect 1 0 2 0;
2719
#X connect 2 0 0 0;
2820
#X restore 18 228 pd loadsrc;
29-
#X obj 18 161 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040
30-
0;
21+
#X obj 18 161 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 0;
3122
#X obj 18 180 fluid.demoaudiofiles;
3223
#X text 19 161 1) select a source;
3324
#X obj 435 176 array define help.specshape.2.src;
34-
#X obj 18 279 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000
35-
#000000;
36-
#X obj 18 299 fluid.bufspectralshape -source help.specshape.2.src -features
37-
help.specshape.2.features -numchans 1;
38-
#X obj 435 206 clone 7 fluid.multiarray help.specshape.2.features,
39-
f 31;
25+
#X obj 18 279 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000 #000000;
26+
#X obj 18 299 fluid.bufspectralshape -source help.specshape.2.src -features help.specshape.2.features -numchans 1;
27+
#X obj 435 206 clone 7 fluid.multiarray help.specshape.2.features, f 31;
4028
#X floatatom 17 357 5 0 0 0 - - - 0;
4129
#X obj 140 421 loadbang;
4230
#X msg 140 446 0;
43-
#X obj 140 487 vradio 15 1 0 7 empty empty empty 0 -8 0 10 #fcfcfc
44-
#000000 #000000 0;
31+
#X obj 140 487 vradio 15 1 0 7 empty empty empty 0 -8 0 10 #fcfcfc #000000 #000000 0;
4532
#X text 156 499 spread, f 13;
4633
#X text 156 514 skewness, f 13;
4734
#X text 156 529 kurtosis, f 13;
@@ -52,8 +39,7 @@ f 31;
5239
#X msg 140 619 symbol help.specshape.2.features-\$1, f 30;
5340
#X floatatom 17 802 5 0 0 0 - - - 0;
5441
#X text 59 802 value;
55-
#X obj 38 279 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040
56-
0;
42+
#X obj 38 279 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 0;
5743
#X text 39 279 2) Do spectral shape analysis;
5844
#N canvas 1876 -561 678 492 draw_visualisation 0;
5945
#X obj 37 61 t a a, f 26;
@@ -66,13 +52,11 @@ f 31;
6652
#X connect 2 0 1 0;
6753
#X connect 4 0 0 0;
6854
#X restore 209 714 pd draw_visualisation;
69-
#X obj 192 742 hsl 345 100 0 1 0 0 empty empty empty -2 -8 0 10 #fcfcfc
70-
#e3c6ff #000000 0 1;
55+
#X obj 192 742 hsl 345 100 0 1 0 0 empty empty empty -2 -8 0 10 #fcfcfc #e3c6ff #000000 0 1;
7156
#X obj 189 742 fluid.waveform 350 100 1 empty empty 0;
7257
#N canvas 1838 -1021 450 300 indexwave 0;
7358
#X obj 24 24 inlet;
74-
#X obj 131 102 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc
75-
#000000 #000000;
59+
#X obj 131 102 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000 #000000;
7660
#X floatatom 137 150 6 0 0 0 - - - 0;
7761
#X obj 25 191 outlet;
7862
#X obj 131 74 r draw;
@@ -86,12 +70,10 @@ f 31;
8670
#X connect 6 0 5 1;
8771
#X restore 189 693 pd indexwave;
8872
#X obj 17 662 t f f, f 25;
89-
#X obj 268 529 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040
90-
0;
73+
#X obj 268 529 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 0;
9174
#X text 163 484 centroid, f 12;
9275
#X text 269 529 4) Select one of the seven descriptors;
93-
#X obj 58 359 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040
94-
0;
76+
#X obj 58 359 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 0;
9577
#X text 59 359 3) Select a frame of analysis;
9678
#X connect 2 0 7 0;
9779
#X connect 4 0 2 0;
@@ -108,65 +90,50 @@ f 31;
10890
#X connect 30 1 29 0;
10991
#X restore 468 612 pd layout_of_results;
11092
#N canvas 216 104 711 872 select 0;
111-
#X obj 17 13 cnv 15 660 42 empty empty fluid.bufspectralshape 1 22
112-
0 36 #4ba3fb #ffffff 0;
113-
#X text 17 79 Seven of the spectral shape descriptors \, computed on
114-
a linear scale for both amplitude and frequency.;
93+
#X obj 17 13 cnv 15 660 42 empty empty fluid.bufspectralshape 1 22 0 36 #4ba3fb #ffffff 0;
94+
#X text 17 79 Seven of the spectral shape descriptors \, computed on a linear scale for both amplitude and frequency.;
11595
#N canvas 1955 -858 448 179 loadsrc 0;
11696
#X obj 16 83 soundfiler;
11797
#X obj 16 19 inlet;
11898
#X msg 16 41 read -resize \$1 help.specshape.3.src;
11999
#X connect 1 0 2 0;
120100
#X connect 2 0 0 0;
121101
#X restore 18 228 pd loadsrc;
122-
#X obj 18 161 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040
123-
0;
102+
#X obj 18 161 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 0;
124103
#X obj 18 180 fluid.demoaudiofiles;
125104
#X text 19 161 1) select a source;
126105
#X obj 445 176 array define help.specshape.3.src;
127-
#X obj 18 588 fluid.bufspectralshape -source help.specshape.3.src -features
128-
help.specshape.3.features -numchans 1;
129-
#X text 105 265 No matter what order you specify the selection in \,
130-
the order that those choices are returned will follow the same order
131-
as if you didn't select any. A good trick for getting the order is
132-
to see the attributes listed out in the object when no '-select' is
133-
chosen., f 63;
134-
#X text 105 355 Think of this parameter like a filter \, rather than
135-
a reordering of the outputs., f 63;
106+
#X obj 18 588 fluid.bufspectralshape -source help.specshape.3.src -features help.specshape.3.features -numchans 1;
107+
#X text 105 265 No matter what order you specify the selection in \, the order that those choices are returned will follow the same order as if you didn't select any. A good trick for getting the order is to see the attributes listed out in the object when no '-select' is chosen., f 63;
108+
#X text 105 355 Think of this parameter like a filter \, rather than a reordering of the outputs., f 63;
136109
#X msg 39 450 select centroid skew \, bang;
137-
#X obj 18 409 cnv 15 500 20 empty empty order:\ centroid\ /\ spread\ /\ skew\ /\ kurtosis\ /\ rolloff\ /\ flatness\ /\ crest
138-
3 10 0 12 #c6ffc7 #404040 0;
110+
#X obj 18 409 cnv 15 500 20 empty empty order:\ centroid\ /\ spread\ /\ skew\ /\ kurtosis\ /\ rolloff\ /\ flatness\ /\ crest 3 10 0 12 #c6ffc7 #404040 0;
139111
#X msg 59 490 select skew centroid \, bang;
140112
#X msg 79 530 select skew kurtosis centroid \, bang;
141113
#X text 250 448 only return the centroid and skew;
142114
#X text 261 487 this is actually the same as above;
143-
#X msg 18 631 features help.specshape.3.features;
144115
#X obj 18 661 fluid.waveform 480 110 1 empty empty 0;
145-
#X obj 445 205 clone 7 fluid.multiarray help.specshape.3.features,
146-
f 33;
116+
#X obj 445 205 clone 7 fluid.multiarray help.specshape.3.features, f 33;
117+
#X msg 18 631 waveform help.specshape.3.src \, features help.specshape.3.features, f 65;
147118
#X connect 4 0 2 0;
148-
#X connect 7 0 16 0;
119+
#X connect 7 0 18 0;
149120
#X connect 10 0 7 0;
150121
#X connect 12 0 7 0;
151122
#X connect 13 0 7 0;
152-
#X connect 16 0 17 0;
123+
#X connect 18 0 16 0;
153124
#X restore 468 634 pd select;
154-
#X obj 17 326 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000
155-
#000000;
156-
#X obj 17 346 fluid.bufspectralshape -source help.specshape.src -features
157-
help.specshape.features -numchans 1;
125+
#X obj 17 326 bng 15 250 50 0 empty empty empty 17 7 0 10 #fcfcfc #000000 #000000;
126+
#X obj 17 346 fluid.bufspectralshape -source help.specshape.src -features help.specshape.features -numchans 1;
158127
#X obj 453 176 array define help.specshape.src;
159-
#X obj 453 206 clone 7 fluid.multiarray help.specshape.features, f
160-
31;
128+
#X obj 453 206 clone 7 fluid.multiarray help.specshape.features, f 31;
161129
#N canvas 1955 -858 448 179 loadsrc 0;
162130
#X obj 16 83 soundfiler;
163131
#X obj 16 19 inlet;
164132
#X msg 16 41 read -resize \$1 help.specshape.src;
165133
#X connect 1 0 2 0;
166134
#X connect 2 0 0 0;
167135
#X restore 18 228 pd loadsrc;
168-
#X obj 18 161 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040
169-
0;
136+
#X obj 18 161 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 0;
170137
#X obj 18 180 fluid.demoaudiofiles;
171138
#X text 19 161 1) select a source;
172139
#N canvas 1433 -768 477 251 drawing_commands 0;
@@ -182,11 +149,9 @@ help.specshape.features -numchans 1;
182149
#X connect 4 1 3 0;
183150
#X restore 17 384 pd drawing_commands;
184151
#X obj 17 408 fluid.waveform 490 100 0 empty empty 0;
185-
#X obj 38 326 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040
186-
0;
152+
#X obj 38 326 cnv 15 15 15 empty empty empty 20 12 0 14 #c6ffc7 #404040 0;
187153
#X text 38 325 2) Do spectral shape analysis;
188-
#X text 515 422 Use the mouse to scrub through different parts of the
189-
audio file and retrieve the analysis, f 24;
154+
#X text 515 422 Use the mouse to scrub through different parts of the audio file and retrieve the analysis, f 24;
190155
#N canvas 998 -1001 1511 939 feature_lookup 0;
191156
#X obj 102 -580 inlet;
192157
#X obj 103 -396 *;
@@ -273,8 +238,7 @@ audio file and retrieve the analysis, f 24;
273238
#X connect 41 0 28 0;
274239
#X coords 0 -1 1 1 185 160 1 100 100;
275240
#X restore 17 543 pd feature_lookup;
276-
#X text 213 547 These are the features taken from reading the arrays
277-
, f 14;
241+
#X text 213 547 These are the features taken from reading the arrays, f 14;
278242
#X obj 468 678 note_on_multithreading;
279243
#X obj 468 656 note_on_automatic_multiarrays;
280244
#X connect 7 0 8 0;

0 commit comments

Comments
 (0)