Merge branch 'main' into pre-production

flucoma · Dec 4, 2024 · 8fb178f · 8fb178f
2 parents 04b01ec + 3bca14a
commit 8fb178f
Show file tree

Hide file tree

Showing 124 changed files with 1,115 additions and 7,417 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -19,7 +19,7 @@ jobs:
         with:
           branch: origin/main
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4.3.6
         with:
           name: winbuild
           path: "release-packaging/FluidCorpusManipulation/externals/"
@@ -45,10 +45,10 @@ jobs:
           apppwd: ${{ secrets.APPSTORECONNECTPWD }}
           appusr: ${{ secrets.APPSTORECONNECTUSERNAME }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4.3.6
         with:
           name: macbuild
-          path: release-packaging/FluidCorpusManipulation/
+          path: "release-packaging/FluidCorpusManipulation/"
 
   release:
     runs-on: ubuntu-latest
@@ -58,12 +58,12 @@ jobs:
       - name: make parent folder
         run : mkdir -p "FluidCorpusManipulation"
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4.1.7
         with:
           name: macbuild
           path: "FluidCorpusManipulation"
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4.1.7
         with:
           name: winbuild
           path: "FluidCorpusManipulation/externals"

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
         with:
           branch: origin/${{ github.ref_name }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4.3.6
         with:
           name: winbuild
           path: "release-packaging/FluidCorpusManipulation/externals/"
@@ -40,10 +40,10 @@ jobs:
           apppwd: ${{ secrets.APPSTORECONNECTPWD }}
           appusr: ${{ secrets.APPSTORECONNECTUSERNAME }}
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4.3.6
         with:
           name: macbuild
-          path: release-packaging/FluidCorpusManipulation/
+          path: "release-packaging/FluidCorpusManipulation/"
 
       - id: get-version
         run: echo "version=$(cat flucoma.version.rc)" >> $GITHUB_OUTPUT
@@ -57,12 +57,12 @@ jobs:
       - name: make parent folder
         run : mkdir -p "FluidCorpusManipulation"
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4.1.7
         with:
           name: macbuild
           path: "FluidCorpusManipulation"
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4.1.7
         with:
           name: winbuild
           path: "FluidCorpusManipulation/externals"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,7 @@ set(FLUID_DOCS_PATH "" CACHE PATH "Optional path to flucoma-docs (needed for doc
 if (APPLE)
   set(CMAKE_XCODE_GENERATE_SCHEME ON)
   set(CMAKE_XCODE_SCHEME_EXECUTABLE "/Applications/Max.app")
-  set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8" CACHE STRING "")
+  set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "")
   #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 
   string(APPEND CMAKE_CXX_FLAGS " -stdlib=libc++")
 endif()
@@ -175,6 +175,8 @@ install(DIRECTORY "${flucoma-core_SOURCE_DIR}/Resources/AudioFiles/"
         DESTINATION "${MAX_PACKAGE_ROOT}/media")
 install(DIRECTORY "${flucoma-core_SOURCE_DIR}/Resources/Data/"
         DESTINATION "${MAX_PACKAGE_ROOT}/misc")
+install(FILES FluidCorpusManipulation_toolbar.svg
+        DESTINATION "${MAX_PACKAGE_ROOT}/misc")
 install(FILES icon.png package-info.json QuickStart.md 
         DESTINATION ${MAX_PACKAGE_ROOT})
 install(FILES ${flucoma-core_SOURCE_DIR}/distribution.lic 

diff --git a/FluidCorpusManipulation_toolbar.svg b/FluidCorpusManipulation_toolbar.svg
diff --git a/QuickStart.md b/QuickStart.md
@@ -2,7 +2,7 @@
 
 ## How to start:
 
-1) move the full FluidCorpusManipulation folder in your Packages folder (~/Documents/Max/Packages/), and restart Max.
+1) move the full `FluidCorpusManipulation` folder in your Packages folder (~/Documents/Max/Packages/), and restart Max.
 
 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.
 

diff --git a/examples/analysing-pitch.maxpat b/examples/analysing-pitch.maxpat
@@ -1096,8 +1096,7 @@
 					"numinlets" : 1,
 					"numoutlets" : 0,
 					"patching_rect" : [ 14.0, 43.0, 202.0, 20.0 ],
-					"text" : "Refining results by using... statistics!",
-					"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
+					"text" : "Refining results by using... statistics!"
 				}
 
 			}
@@ -1901,8 +1900,7 @@
 					"numinlets" : 1,
 					"numoutlets" : 0,
 					"patching_rect" : [ 137.0, 402.0, 99.0, 60.0 ],
-					"text" : "With the outliers stripped, we see a much tighter range...",
-					"textcolor" : [ 0.129411764705882, 0.129411764705882, 0.129411764705882, 0.53 ]
+					"text" : "With the outliers stripped, we see a much tighter range..."
 				}
 
 			}
@@ -1914,8 +1912,7 @@
 					"numinlets" : 1,
 					"numoutlets" : 0,
 					"patching_rect" : [ 471.833316500000024, 395.166625999999951, 97.0, 74.0 ],
-					"text" : "The weighted stats have the same range but much less variance",
-					"textcolor" : [ 0.129411764705882, 0.129411764705882, 0.129411764705882, 0.53 ]
+					"text" : "The weighted stats have the same range but much less variance"
 				}
 
 			}
@@ -1927,8 +1924,7 @@
 					"numinlets" : 1,
 					"numoutlets" : 0,
 					"patching_rect" : [ 807.0, 395.166625999999951, 97.0, 74.0 ],
-					"text" : "The unweighted stats have a huge range (145-6.7kHz) and variance",
-					"textcolor" : [ 0.129411764705882, 0.129411764705882, 0.129411764705882, 0.53 ]
+					"text" : "The unweighted stats have a huge range (145-6.7kHz) and variance"
 				}
 
 			}
@@ -1940,8 +1936,7 @@
 					"numinlets" : 1,
 					"numoutlets" : 0,
 					"patching_rect" : [ 1019.0, 474.0, 259.333313000000089, 47.0 ],
-					"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",
-					"textcolor" : [ 0.129411764705882, 0.129411764705882, 0.129411764705882, 0.47 ]
+					"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"
 				}
 
 			}

diff --git a/examples/audioreactive.maxpat b/examples/audioreactive.maxpat
@@ -114,8 +114,7 @@
 					"numinlets" : 1,
 					"numoutlets" : 0,
 					"patching_rect" : [ 386.0, 145.0, 150.0, 87.0 ],
-					"text" : "Modify the threshold to your taste. Lower numbers are more sensitive and higher numbers are less sensitive.",
-					"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
+					"text" : "Modify the threshold to your taste. Lower numbers are more sensitive and higher numbers are less sensitive."
 				}
 
 			}
@@ -127,8 +126,7 @@
 					"numinlets" : 1,
 					"numoutlets" : 0,
 					"patching_rect" : [ 762.000003427267075, 347.5, 124.0, 87.0 ],
-					"text" : "Measuring the \"novelty\" of the sound. Things that are \"newer\", i.e more novel increase the distortion.",
-					"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
+					"text" : "Measuring the \"novelty\" of the sound. Things that are \"newer\", i.e more novel increase the distortion."
 				}
 
 			}
@@ -140,8 +138,7 @@
 					"numinlets" : 1,
 					"numoutlets" : 0,
 					"patching_rect" : [ 301.000003427267075, 362.833337247371674, 123.0, 33.0 ],
-					"text" : "Time between consecutive bangs",
-					"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
+					"text" : "Time between consecutive bangs"
 				}
 
 			}
@@ -152,8 +149,7 @@
 					"numinlets" : 1,
 					"numoutlets" : 0,
 					"patching_rect" : [ 73.0, 400.333337247371674, 123.0, 20.0 ],
-					"text" : "Bang on every trigger",
-					"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
+					"text" : "Bang on every trigger"
 				}
 
 			}
@@ -165,8 +161,7 @@
 					"numinlets" : 1,
 					"numoutlets" : 0,
 					"patching_rect" : [ 376.5, 13.0, 440.0, 100.0 ],
-					"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.",
-					"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
+					"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."
 				}
 
 			}
@@ -289,8 +284,7 @@
 					"numinlets" : 1,
 					"numoutlets" : 0,
 					"patching_rect" : [ 16.0, 45.0, 299.0, 20.0 ],
-					"text" : "Using a segmentation algorithm to trigger audio events",
-					"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
+					"text" : "Using a segmentation algorithm to trigger audio events"
 				}
 
 			}

diff --git a/examples/autoencoder.maxpat b/examples/autoencoder.maxpat
@@ -46,8 +46,7 @@
 					"numinlets" : 1,
 					"numoutlets" : 0,
 					"patching_rect" : [ 714.0, 373.0, 323.0, 87.0 ],
-					"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.",
-					"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
+					"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."
 				}
 
 			}
@@ -59,8 +58,7 @@
 					"numinlets" : 1,
 					"numoutlets" : 0,
 					"patching_rect" : [ 151.0, 399.762878000000001, 328.5, 33.0 ],
-					"text" : "Keep pressing stage (4) until the fit number seems to stop moving. A good value is around 0.20 in this example",
-					"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
+					"text" : "Keep pressing stage (4) until the fit number seems to stop moving. A good value is around 0.20 in this example"
 				}
 
 			}
@@ -212,8 +210,7 @@
 					"numinlets" : 1,
 					"numoutlets" : 0,
 					"patching_rect" : [ 297.5, 20.0, 699.0, 60.0 ],
-					"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!",
-					"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
+					"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!"
 				}
 
 			}
@@ -224,8 +221,7 @@
 					"numinlets" : 1,
 					"numoutlets" : 0,
 					"patching_rect" : [ 13.0, 48.0, 269.0, 20.0 ],
-					"text" : "Neural networks learning how to reconstruct data",
-					"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
+					"text" : "Neural networks learning how to reconstruct data"
 				}
 
 			}
@@ -612,8 +608,7 @@
 									"numinlets" : 1,
 									"numoutlets" : 0,
 									"patching_rect" : [ 70.5, 205.5, 286.0, 33.0 ],
-									"text" : "this is the hop size of the analysis, to convert the position of the lookup to a position in the audio file",
-									"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
+									"text" : "this is the hop size of the analysis, to convert the position of the lookup to a position in the audio file"
 								}
 
 							}
@@ -870,8 +865,7 @@
 					"numinlets" : 1,
 					"numoutlets" : 0,
 					"patching_rect" : [ 834.0, 651.0, 190.0, 20.0 ],
-					"text" : "predicting from the neural network",
-					"textcolor" : [ 1.0, 1.0, 1.0, 1.0 ]
+					"text" : "predicting from the neural network"
 				}
 
 			}
@@ -882,8 +876,7 @@
 					"numinlets" : 1,
 					"numoutlets" : 0,
 					"patching_rect" : [ 540.0, 651.0, 55.0, 20.0 ],
-					"text" : "raw data",
-					"textcolor" : [ 1.0, 1.0, 1.0, 1.0 ]
+					"text" : "raw data"
 				}
 
 			}

diff --git a/examples/bufcompose-example.maxpat b/examples/bufcompose-example.maxpat
@@ -61,8 +61,7 @@
 					"numinlets" : 1,
 					"numoutlets" : 0,
 					"patching_rect" : [ 89.0, 102.0, 382.0, 20.0 ],
-					"text" : "If you need to reset the state of the buffers~ double click this loadbang",
-					"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
+					"text" : "If you need to reset the state of the buffers~ double click this loadbang"
 				}
 
 			}
@@ -74,8 +73,7 @@
 					"numinlets" : 1,
 					"numoutlets" : 0,
 					"patching_rect" : [ 196.0, 406.0, 382.0, 33.0 ],
-					"text" : "All of the \"macros\" are created purely in Max around the fluid.bufcompose~ object",
-					"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
+					"text" : "All of the \"macros\" are created purely in Max around the fluid.bufcompose~ object"
 				}
 
 			}
@@ -134,8 +132,7 @@
 					"numinlets" : 1,
 					"numoutlets" : 0,
 					"patching_rect" : [ 27.0, 47.0, 299.0, 20.0 ],
-					"text" : "Advanced usage of fluid.bufcompose~ with \"macros\"",
-					"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
+					"text" : "Advanced usage of fluid.bufcompose~ with \"macros\""
 				}
 
 			}

diff --git a/examples/buffermanagement-example.maxpat b/examples/buffermanagement-example.maxpat
@@ -198,8 +198,7 @@
 									"numinlets" : 1,
 									"numoutlets" : 0,
 									"patching_rect" : [ 575.0, 266.0, 281.0, 50.0 ],
-									"text" : "At the end here we \"refer\" an unnamed fluid.dataset~ to the output of fluid.normalize~ in order to dump its contents.",
-									"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
+									"text" : "At the end here we \"refer\" an unnamed fluid.dataset~ to the output of fluid.normalize~ in order to dump its contents."
 								}
 
 							}
@@ -442,8 +441,7 @@
 									"numinlets" : 1,
 									"numoutlets" : 0,
 									"patching_rect" : [ 10.0, 47.0, 314.0, 21.0 ],
-									"text" : "Getting to grip with the basics of fluid.dataset~ usage",
-									"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
+									"text" : "Getting to grip with the basics of fluid.dataset~ usage"
 								}
 
 							}
@@ -1082,8 +1080,7 @@
 									"numinlets" : 1,
 									"numoutlets" : 0,
 									"patching_rect" : [ 10.0, 47.0, 206.0, 21.0 ],
-									"text" : "Caveats and things to be aware of",
-									"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
+									"text" : "Caveats and things to be aware of"
 								}
 
 							}
@@ -1420,8 +1417,7 @@
 									"numinlets" : 1,
 									"numoutlets" : 0,
 									"patching_rect" : [ 10.0, 47.0, 179.0, 21.0 ],
-									"text" : "Automatic output buffers~",
-									"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
+									"text" : "Automatic output buffers~"
 								}
 
 							}
@@ -2193,8 +2189,7 @@
 									"numinlets" : 1,
 									"numoutlets" : 0,
 									"patching_rect" : [ 10.0, 47.0, 314.0, 21.0 ],
-									"text" : "Getting to grip with the basics of fluid.dataset~ usage",
-									"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
+									"text" : "Getting to grip with the basics of fluid.dataset~ usage"
 								}
 
 							}
@@ -2897,8 +2892,7 @@
 									"numinlets" : 1,
 									"numoutlets" : 0,
 									"patching_rect" : [ 10.0, 47.0, 210.0, 21.0 ],
-									"text" : "The basics of buffer~ management",
-									"textcolor" : [ 0.501960784313725, 0.501960784313725, 0.501960784313725, 1.0 ]
+									"text" : "The basics of buffer~ management"
 								}
 
 							}