Skip to content

Commit 0a9327e

Browse files
committed
Merge branch 'pre-production' into production
2 parents c80e438 + 23b2e44 commit 0a9327e

File tree

124 files changed

+1122
-7456
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+1122
-7456
lines changed

.github/workflows/nightly.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
with:
2020
branch: origin/main
2121

22-
- uses: actions/upload-artifact@v3
22+
- uses: actions/upload-artifact@v4.3.6
2323
with:
2424
name: winbuild
2525
path: "release-packaging/FluidCorpusManipulation/externals/"
@@ -45,10 +45,10 @@ jobs:
4545
apppwd: ${{ secrets.APPSTORECONNECTPWD }}
4646
appusr: ${{ secrets.APPSTORECONNECTUSERNAME }}
4747

48-
- uses: actions/upload-artifact@v3
48+
- uses: actions/upload-artifact@v4.3.6
4949
with:
5050
name: macbuild
51-
path: release-packaging/FluidCorpusManipulation/
51+
path: "release-packaging/FluidCorpusManipulation/"
5252

5353
release:
5454
runs-on: ubuntu-latest
@@ -58,12 +58,12 @@ jobs:
5858
- name: make parent folder
5959
run : mkdir -p "FluidCorpusManipulation"
6060

61-
- uses: actions/download-artifact@v3
61+
- uses: actions/download-artifact@v4.1.7
6262
with:
6363
name: macbuild
6464
path: "FluidCorpusManipulation"
6565

66-
- uses: actions/download-artifact@v3
66+
- uses: actions/download-artifact@v4.1.7
6767
with:
6868
name: winbuild
6969
path: "FluidCorpusManipulation/externals"

.github/workflows/release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
with:
1313
branch: origin/${{ github.ref_name }}
1414

15-
- uses: actions/upload-artifact@v3
15+
- uses: actions/upload-artifact@v4.3.6
1616
with:
1717
name: winbuild
1818
path: "release-packaging/FluidCorpusManipulation/externals/"
@@ -40,10 +40,10 @@ jobs:
4040
apppwd: ${{ secrets.APPSTORECONNECTPWD }}
4141
appusr: ${{ secrets.APPSTORECONNECTUSERNAME }}
4242

43-
- uses: actions/upload-artifact@v3
43+
- uses: actions/upload-artifact@v4.3.6
4444
with:
4545
name: macbuild
46-
path: release-packaging/FluidCorpusManipulation/
46+
path: "release-packaging/FluidCorpusManipulation/"
4747

4848
- id: get-version
4949
run: echo "version=$(cat flucoma.version.rc)" >> $GITHUB_OUTPUT
@@ -57,12 +57,12 @@ jobs:
5757
- name: make parent folder
5858
run : mkdir -p "FluidCorpusManipulation"
5959

60-
- uses: actions/download-artifact@v3
60+
- uses: actions/download-artifact@v4.1.7
6161
with:
6262
name: macbuild
6363
path: "FluidCorpusManipulation"
6464

65-
- uses: actions/download-artifact@v3
65+
- uses: actions/download-artifact@v4.1.7
6666
with:
6767
name: winbuild
6868
path: "FluidCorpusManipulation/externals"

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ set(FLUID_DOCS_PATH "" CACHE PATH "Optional path to flucoma-docs (needed for doc
3131
if (APPLE)
3232
set(CMAKE_XCODE_GENERATE_SCHEME ON)
3333
set(CMAKE_XCODE_SCHEME_EXECUTABLE "/Applications/Max.app")
34-
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8" CACHE STRING "")
34+
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "")
3535
#A consequence of targetting 10.8. Needs to be set globally from 10.15 onwards in order for the test program to compile successfully during configure
3636
string(APPEND CMAKE_CXX_FLAGS " -stdlib=libc++")
3737
endif()
@@ -175,6 +175,8 @@ install(DIRECTORY "${flucoma-core_SOURCE_DIR}/Resources/AudioFiles/"
175175
DESTINATION "${MAX_PACKAGE_ROOT}/media")
176176
install(DIRECTORY "${flucoma-core_SOURCE_DIR}/Resources/Data/"
177177
DESTINATION "${MAX_PACKAGE_ROOT}/misc")
178+
install(FILES FluidCorpusManipulation_toolbar.svg
179+
DESTINATION "${MAX_PACKAGE_ROOT}/misc")
178180
install(FILES icon.png package-info.json QuickStart.md
179181
DESTINATION ${MAX_PACKAGE_ROOT})
180182
install(FILES ${flucoma-core_SOURCE_DIR}/distribution.lic

FluidCorpusManipulation_toolbar.svg

Lines changed: 1 addition & 0 deletions
Loading

QuickStart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## How to start:
44

5-
1) move the full FluidCorpusManipulation folder in your Packages folder (~/Documents/Max/Packages/), and restart Max.
5+
1) move the full `FluidCorpusManipulation` folder in your Packages folder (~/Documents/Max/Packages/), and restart Max.
66

77
There is now an 'extras' giving the overview of the toolbox, and a shortcut (shift-f) to create fluid.* objects. Full documentation, and examples, are also available.
88

examples/analysing-pitch.maxpat

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,8 +1096,7 @@
10961096
"numinlets" : 1,
10971097
"numoutlets" : 0,
10981098
"patching_rect" : [ 14.0, 43.0, 202.0, 20.0 ],
1099-
"text" : "Refining results by using... statistics!",
1100-
"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
1099+
"text" : "Refining results by using... statistics!"
11011100
}
11021101

11031102
}
@@ -1901,8 +1900,7 @@
19011900
"numinlets" : 1,
19021901
"numoutlets" : 0,
19031902
"patching_rect" : [ 137.0, 402.0, 99.0, 60.0 ],
1904-
"text" : "With the outliers stripped, we see a much tighter range...",
1905-
"textcolor" : [ 0.129411764705882, 0.129411764705882, 0.129411764705882, 0.53 ]
1903+
"text" : "With the outliers stripped, we see a much tighter range..."
19061904
}
19071905

19081906
}
@@ -1914,8 +1912,7 @@
19141912
"numinlets" : 1,
19151913
"numoutlets" : 0,
19161914
"patching_rect" : [ 471.833316500000024, 395.166625999999951, 97.0, 74.0 ],
1917-
"text" : "The weighted stats have the same range but much less variance",
1918-
"textcolor" : [ 0.129411764705882, 0.129411764705882, 0.129411764705882, 0.53 ]
1915+
"text" : "The weighted stats have the same range but much less variance"
19191916
}
19201917

19211918
}
@@ -1927,8 +1924,7 @@
19271924
"numinlets" : 1,
19281925
"numoutlets" : 0,
19291926
"patching_rect" : [ 807.0, 395.166625999999951, 97.0, 74.0 ],
1930-
"text" : "The unweighted stats have a huge range (145-6.7kHz) and variance",
1931-
"textcolor" : [ 0.129411764705882, 0.129411764705882, 0.129411764705882, 0.53 ]
1927+
"text" : "The unweighted stats have a huge range (145-6.7kHz) and variance"
19321928
}
19331929

19341930
}
@@ -1940,8 +1936,7 @@
19401936
"numinlets" : 1,
19411937
"numoutlets" : 0,
19421938
"patching_rect" : [ 1019.0, 474.0, 259.333313000000089, 47.0 ],
1943-
"text" : "We can see clear bits in the pitch confidence where it's higher / lower: we're hoping this can be used to get more beleiveable statistics",
1944-
"textcolor" : [ 0.129411764705882, 0.129411764705882, 0.129411764705882, 0.47 ]
1939+
"text" : "We can see clear bits in the pitch confidence where it's higher / lower: we're hoping this can be used to get more beleiveable statistics"
19451940
}
19461941

19471942
}

examples/audioreactive.maxpat

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,7 @@
114114
"numinlets" : 1,
115115
"numoutlets" : 0,
116116
"patching_rect" : [ 386.0, 145.0, 150.0, 87.0 ],
117-
"text" : "Modify the threshold to your taste. Lower numbers are more sensitive and higher numbers are less sensitive.",
118-
"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
117+
"text" : "Modify the threshold to your taste. Lower numbers are more sensitive and higher numbers are less sensitive."
119118
}
120119

121120
}
@@ -127,8 +126,7 @@
127126
"numinlets" : 1,
128127
"numoutlets" : 0,
129128
"patching_rect" : [ 762.000003427267075, 347.5, 124.0, 87.0 ],
130-
"text" : "Measuring the \"novelty\" of the sound. Things that are \"newer\", i.e more novel increase the distortion.",
131-
"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
129+
"text" : "Measuring the \"novelty\" of the sound. Things that are \"newer\", i.e more novel increase the distortion."
132130
}
133131

134132
}
@@ -140,8 +138,7 @@
140138
"numinlets" : 1,
141139
"numoutlets" : 0,
142140
"patching_rect" : [ 301.000003427267075, 362.833337247371674, 123.0, 33.0 ],
143-
"text" : "Time between consecutive bangs",
144-
"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
141+
"text" : "Time between consecutive bangs"
145142
}
146143

147144
}
@@ -152,8 +149,7 @@
152149
"numinlets" : 1,
153150
"numoutlets" : 0,
154151
"patching_rect" : [ 73.0, 400.333337247371674, 123.0, 20.0 ],
155-
"text" : "Bang on every trigger",
156-
"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
152+
"text" : "Bang on every trigger"
157153
}
158154

159155
}
@@ -165,8 +161,7 @@
165161
"numinlets" : 1,
166162
"numoutlets" : 0,
167163
"patching_rect" : [ 376.5, 13.0, 440.0, 100.0 ],
168-
"text" : "This patch shows you could very quickly start integrating FluComa objects into a patch that makes sound. This patch leverages fluid.onsetslice~ to detect when changes in the input sound. This creates a trigger which generates sound by passing the signal-rate click into a resonant filter. That signal is converted into a bang event using edge~ which also modulates the pitch. The fluid.noveltyfeature~ object estimates how \"new\" the signal is, which is then mapped onto the distortion amount.",
169-
"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
164+
"text" : "This patch shows you could very quickly start integrating FluComa objects into a patch that makes sound. This patch leverages fluid.onsetslice~ to detect when changes in the input sound. This creates a trigger which generates sound by passing the signal-rate click into a resonant filter. That signal is converted into a bang event using edge~ which also modulates the pitch. The fluid.noveltyfeature~ object estimates how \"new\" the signal is, which is then mapped onto the distortion amount."
170165
}
171166

172167
}
@@ -289,8 +284,7 @@
289284
"numinlets" : 1,
290285
"numoutlets" : 0,
291286
"patching_rect" : [ 16.0, 45.0, 299.0, 20.0 ],
292-
"text" : "Using a segmentation algorithm to trigger audio events",
293-
"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
287+
"text" : "Using a segmentation algorithm to trigger audio events"
294288
}
295289

296290
}

examples/autoencoder.maxpat

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@
4646
"numinlets" : 1,
4747
"numoutlets" : 0,
4848
"patching_rect" : [ 714.0, 373.0, 323.0, 87.0 ],
49-
"text" : "This space represents the values of each neuron in the central hidden layer of the neural network.\n\nIt has, to some extent, learned a lower-dimensional representation of the input-norm data space by figuring out how it can reconstruct it with only 2 dimensions.",
50-
"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
49+
"text" : "This space represents the values of each neuron in the central hidden layer of the neural network.\n\nIt has, to some extent, learned a lower-dimensional representation of the input-norm data space by figuring out how it can reconstruct it with only 2 dimensions."
5150
}
5251

5352
}
@@ -59,8 +58,7 @@
5958
"numinlets" : 1,
6059
"numoutlets" : 0,
6160
"patching_rect" : [ 151.0, 399.762878000000001, 328.5, 33.0 ],
62-
"text" : "Keep pressing stage (4) until the fit number seems to stop moving. A good value is around 0.20 in this example",
63-
"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
61+
"text" : "Keep pressing stage (4) until the fit number seems to stop moving. A good value is around 0.20 in this example"
6462
}
6563

6664
}
@@ -212,8 +210,7 @@
212210
"numinlets" : 1,
213211
"numoutlets" : 0,
214212
"patching_rect" : [ 297.5, 20.0, 699.0, 60.0 ],
215-
"text" : "Without getting too deep into the weeds a neural network learns the relationship between input and output data. If we ask it to learn the relationship between the same data as the input and output it essentially learns how it 'reconstruct' the data using a smaller number of dimensions (the neurons in the hidden layers). This means we can use the fluid.mlpregressor~ as a form of dimension reduction!",
216-
"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
213+
"text" : "Without getting too deep into the weeds a neural network learns the relationship between input and output data. If we ask it to learn the relationship between the same data as the input and output it essentially learns how it 'reconstruct' the data using a smaller number of dimensions (the neurons in the hidden layers). This means we can use the fluid.mlpregressor~ as a form of dimension reduction!"
217214
}
218215

219216
}
@@ -224,8 +221,7 @@
224221
"numinlets" : 1,
225222
"numoutlets" : 0,
226223
"patching_rect" : [ 13.0, 48.0, 269.0, 20.0 ],
227-
"text" : "Neural networks learning how to reconstruct data",
228-
"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
224+
"text" : "Neural networks learning how to reconstruct data"
229225
}
230226

231227
}
@@ -612,8 +608,7 @@
612608
"numinlets" : 1,
613609
"numoutlets" : 0,
614610
"patching_rect" : [ 70.5, 205.5, 286.0, 33.0 ],
615-
"text" : "this is the hop size of the analysis, to convert the position of the lookup to a position in the audio file",
616-
"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
611+
"text" : "this is the hop size of the analysis, to convert the position of the lookup to a position in the audio file"
617612
}
618613

619614
}
@@ -870,8 +865,7 @@
870865
"numinlets" : 1,
871866
"numoutlets" : 0,
872867
"patching_rect" : [ 834.0, 651.0, 190.0, 20.0 ],
873-
"text" : "predicting from the neural network",
874-
"textcolor" : [ 1.0, 1.0, 1.0, 1.0 ]
868+
"text" : "predicting from the neural network"
875869
}
876870

877871
}
@@ -882,8 +876,7 @@
882876
"numinlets" : 1,
883877
"numoutlets" : 0,
884878
"patching_rect" : [ 540.0, 651.0, 55.0, 20.0 ],
885-
"text" : "raw data",
886-
"textcolor" : [ 1.0, 1.0, 1.0, 1.0 ]
879+
"text" : "raw data"
887880
}
888881

889882
}

examples/bufcompose-example.maxpat

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@
6161
"numinlets" : 1,
6262
"numoutlets" : 0,
6363
"patching_rect" : [ 89.0, 102.0, 382.0, 20.0 ],
64-
"text" : "If you need to reset the state of the buffers~ double click this loadbang",
65-
"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
64+
"text" : "If you need to reset the state of the buffers~ double click this loadbang"
6665
}
6766

6867
}
@@ -74,8 +73,7 @@
7473
"numinlets" : 1,
7574
"numoutlets" : 0,
7675
"patching_rect" : [ 196.0, 406.0, 382.0, 33.0 ],
77-
"text" : "All of the \"macros\" are created purely in Max around the fluid.bufcompose~ object",
78-
"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
76+
"text" : "All of the \"macros\" are created purely in Max around the fluid.bufcompose~ object"
7977
}
8078

8179
}
@@ -134,8 +132,7 @@
134132
"numinlets" : 1,
135133
"numoutlets" : 0,
136134
"patching_rect" : [ 27.0, 47.0, 299.0, 20.0 ],
137-
"text" : "Advanced usage of fluid.bufcompose~ with \"macros\"",
138-
"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
135+
"text" : "Advanced usage of fluid.bufcompose~ with \"macros\""
139136
}
140137

141138
}

examples/buffermanagement-example.maxpat

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,7 @@
198198
"numinlets" : 1,
199199
"numoutlets" : 0,
200200
"patching_rect" : [ 575.0, 266.0, 281.0, 50.0 ],
201-
"text" : "At the end here we \"refer\" an unnamed fluid.dataset~ to the output of fluid.normalize~ in order to dump its contents.",
202-
"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
201+
"text" : "At the end here we \"refer\" an unnamed fluid.dataset~ to the output of fluid.normalize~ in order to dump its contents."
203202
}
204203

205204
}
@@ -442,8 +441,7 @@
442441
"numinlets" : 1,
443442
"numoutlets" : 0,
444443
"patching_rect" : [ 10.0, 47.0, 314.0, 21.0 ],
445-
"text" : "Getting to grip with the basics of fluid.dataset~ usage",
446-
"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
444+
"text" : "Getting to grip with the basics of fluid.dataset~ usage"
447445
}
448446

449447
}
@@ -1082,8 +1080,7 @@
10821080
"numinlets" : 1,
10831081
"numoutlets" : 0,
10841082
"patching_rect" : [ 10.0, 47.0, 206.0, 21.0 ],
1085-
"text" : "Caveats and things to be aware of",
1086-
"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
1083+
"text" : "Caveats and things to be aware of"
10871084
}
10881085

10891086
}
@@ -1420,8 +1417,7 @@
14201417
"numinlets" : 1,
14211418
"numoutlets" : 0,
14221419
"patching_rect" : [ 10.0, 47.0, 179.0, 21.0 ],
1423-
"text" : "Automatic output buffers~",
1424-
"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
1420+
"text" : "Automatic output buffers~"
14251421
}
14261422

14271423
}
@@ -2193,8 +2189,7 @@
21932189
"numinlets" : 1,
21942190
"numoutlets" : 0,
21952191
"patching_rect" : [ 10.0, 47.0, 314.0, 21.0 ],
2196-
"text" : "Getting to grip with the basics of fluid.dataset~ usage",
2197-
"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
2192+
"text" : "Getting to grip with the basics of fluid.dataset~ usage"
21982193
}
21992194

22002195
}
@@ -2897,8 +2892,7 @@
28972892
"numinlets" : 1,
28982893
"numoutlets" : 0,
28992894
"patching_rect" : [ 10.0, 47.0, 210.0, 21.0 ],
2900-
"text" : "The basics of buffer~ management",
2901-
"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
2895+
"text" : "The basics of buffer~ management"
29022896
}
29032897

29042898
}

0 commit comments

Comments
 (0)