From 91ad3113cc35314bde38e0afe0e84fd8866efc72 Mon Sep 17 00:00:00 2001 From: James Bradbury Date: Mon, 28 Oct 2024 19:09:20 +0100 Subject: [PATCH] update references of FluidCorpusManipulation Makes them all Fluid Corpus Manipulation # Conflicts: # source/include/FluidMaxWrapper.hpp --- .github/workflows/nightly.yml | 12 +++++----- .github/workflows/release.yml | 12 +++++----- CMakeLists.txt | 2 +- QuickStart.md | 2 +- help/fluid.jit.plotter.maxhelp | 8 +++---- help/fluid.kdtree~.maxhelp | 24 +++++++++---------- help/fluid.plotter.maxhelp | 10 ++++---- local_docs/fluid.audiofilesin.maxref.xml | 2 +- local_docs/fluid.buf2list.maxref.xml | 2 +- local_docs/fluid.concataudiofiles.maxref.xml | 2 +- local_docs/fluid.jit.plotter.maxref.xml | 2 +- local_docs/fluid.list2buf.maxref.xml | 2 +- local_docs/fluid.plotter.maxref.xml | 2 +- local_docs/fluid.waveform~.maxref.xml | 2 +- package-info.json.in | 2 +- patchers/fluid.jit.plotter.maxpat | 4 ++-- ...c_buffer_and_dataset_management.maxvig.xml | 2 +- .../flucoma/bufcompose_macros.maxvig.xml | 2 +- 18 files changed, 47 insertions(+), 47 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 5cdb88d1..46ab8d85 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/upload-artifact@v4.3.6 with: name: winbuild - path: "release-packaging/FluidCorpusManipulation/externals/" + path: "release-packaging/Fluid Corpus Manipulation/externals/" macbuild: runs-on: macos-latest @@ -48,7 +48,7 @@ jobs: - uses: actions/upload-artifact@v4.3.6 with: name: macbuild - path: release-packaging/FluidCorpusManipulation/ + path: "release-packaging/Fluid Corpus Manipulation/"" release: runs-on: ubuntu-latest @@ -56,20 +56,20 @@ jobs: steps: - name: make parent folder - run : mkdir -p "FluidCorpusManipulation" + run : mkdir -p "Fluid Corpus Manipulation" - uses: actions/download-artifact@v4.1.7 with: name: macbuild - path: "FluidCorpusManipulation" + path: "Fluid Corpus Manipulation" - uses: actions/download-artifact@v4.1.7 with: name: winbuild - path: "FluidCorpusManipulation/externals" + path: "Fluid Corpus Manipulation/externals" - name: zip - run: zip -r FluCoMa-Max-nightly.zip "FluidCorpusManipulation" + run: zip -r FluCoMa-Max-nightly.zip "Fluid Corpus Manipulation" - uses: dev-drprasad/delete-tag-and-release@v0.2.1 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b3546b82..4d37ede5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/upload-artifact@v4.3.6 with: name: winbuild - path: "release-packaging/FluidCorpusManipulation/externals/" + path: "release-packaging/Fluid Corpus Manipulation/externals/" macbuild: runs-on: macos-latest @@ -43,7 +43,7 @@ jobs: - uses: actions/upload-artifact@v4.3.6 with: name: macbuild - path: release-packaging/FluidCorpusManipulation/ + path: "release-packaging/Fluid Corpus Manipulation/" - id: get-version run: echo "version=$(cat flucoma.version.rc)" >> $GITHUB_OUTPUT @@ -55,20 +55,20 @@ jobs: steps: - name: make parent folder - run : mkdir -p "FluidCorpusManipulation" + run : mkdir -p "Fluid Corpus Manipulation" - uses: actions/download-artifact@v4.1.7 with: name: macbuild - path: "FluidCorpusManipulation" + path: "Fluid Corpus Manipulation" - uses: actions/download-artifact@v4.1.7 with: name: winbuild - path: "FluidCorpusManipulation/externals" + path: "Fluid Corpus Manipulation/externals" - name: zip - run: zip -r FluCoMa-Max-"${{ needs.macbuild.outputs.version }}".zip "FluidCorpusManipulation" + run: zip -r FluCoMa-Max-"${{ needs.macbuild.outputs.version }}".zip "Fluid Corpus Manipulation" - name: delete pre-existing release uses: dev-drprasad/delete-tag-and-release@v0.2.1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b5439f1..921625b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) set(MAX_INSTALL_PREFIX "." CACHE PATH "Prefix for assembling max package") -set(FLUID_PACKAGE_NAME "FluidCorpusManipulation" CACHE STRING "Name for published package") +set(FLUID_PACKAGE_NAME "Fluid Corpus Manipulation" CACHE STRING "Name for published package") set(MAX_PACKAGE_ROOT ${MAX_INSTALL_PREFIX}/${FLUID_PACKAGE_NAME}) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/source/script") ################################################################################ diff --git a/QuickStart.md b/QuickStart.md index 1199d8d4..f8af694d 100644 --- 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 Fluid Corpus Manipulation 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/help/fluid.jit.plotter.maxhelp b/help/fluid.jit.plotter.maxhelp index 89a8e4ea..a04d6bb5 100644 --- a/help/fluid.jit.plotter.maxhelp +++ b/help/fluid.jit.plotter.maxhelp @@ -6631,7 +6631,7 @@ } , { "name" : "fluid.dataloader.maxpat", - "bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/patchers", + "bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/patchers", "patcherrelativepath" : "../patchers", "type" : "JSON", "implicit" : 1 @@ -6642,21 +6642,21 @@ } , { "name" : "fluid.jit.plotter.labels2colors.js", - "bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/javascript", + "bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/javascript", "patcherrelativepath" : "../javascript", "type" : "TEXT", "implicit" : 1 } , { "name" : "fluid.jit.plotter.maxpat", - "bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/patchers", + "bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/patchers", "patcherrelativepath" : "../patchers", "type" : "JSON", "implicit" : 1 } , { "name" : "fluid.jit.plotter.resize.pworld.js", - "bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/javascript", + "bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/javascript", "patcherrelativepath" : "../javascript", "type" : "TEXT", "implicit" : 1 diff --git a/help/fluid.kdtree~.maxhelp b/help/fluid.kdtree~.maxhelp index ee98465a..cf7de1a0 100644 --- a/help/fluid.kdtree~.maxhelp +++ b/help/fluid.kdtree~.maxhelp @@ -4461,36 +4461,36 @@ } , { "name" : "fluid.concataudiofiles.maxpat", - "bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/FluidCorpusManipulation/patchers", - "patcherrelativepath" : "../../nightly_builds/Max/FluidCorpusManipulation/patchers", + "bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/Fluid Corpus Manipulation/patchers", + "patcherrelativepath" : "../../nightly_builds/Max/Fluid Corpus Manipulation/patchers", "type" : "JSON", "implicit" : 1 } , { "name" : "fluid.dsinterface.maxpat", - "bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/FluidCorpusManipulation/patchers", - "patcherrelativepath" : "../../nightly_builds/Max/FluidCorpusManipulation/patchers", + "bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/Fluid Corpus Manipulation/patchers", + "patcherrelativepath" : "../../nightly_builds/Max/Fluid Corpus Manipulation/patchers", "type" : "JSON", "implicit" : 1 } , { "name" : "fluid.dslink.maxpat", - "bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/FluidCorpusManipulation/patchers", - "patcherrelativepath" : "../../nightly_builds/Max/FluidCorpusManipulation/patchers", + "bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/Fluid Corpus Manipulation/patchers", + "patcherrelativepath" : "../../nightly_builds/Max/Fluid Corpus Manipulation/patchers", "type" : "JSON", "implicit" : 1 } , { "name" : "fluid.flucomaorg.maxpat", - "bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/FluidCorpusManipulation/patchers", - "patcherrelativepath" : "../../nightly_builds/Max/FluidCorpusManipulation/patchers", + "bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/Fluid Corpus Manipulation/patchers", + "patcherrelativepath" : "../../nightly_builds/Max/Fluid Corpus Manipulation/patchers", "type" : "JSON", "implicit" : 1 } , { "name" : "fluid.learn.maxpat", - "bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/FluidCorpusManipulation/patchers", - "patcherrelativepath" : "../../nightly_builds/Max/FluidCorpusManipulation/patchers", + "bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/Fluid Corpus Manipulation/patchers", + "patcherrelativepath" : "../../nightly_builds/Max/Fluid Corpus Manipulation/patchers", "type" : "JSON", "implicit" : 1 } @@ -4504,8 +4504,8 @@ } , { "name" : "fluid.plotter.js", - "bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/FluidCorpusManipulation/jsui", - "patcherrelativepath" : "../../nightly_builds/Max/FluidCorpusManipulation/jsui", + "bootpath" : "~/Documents/documents@hudd/research/projects/fluid corpus navigation/research/nightly_builds/Max/Fluid Corpus Manipulation/jsui", + "patcherrelativepath" : "../../nightly_builds/Max/Fluid Corpus Manipulation/jsui", "type" : "TEXT", "implicit" : 1 } diff --git a/help/fluid.plotter.maxhelp b/help/fluid.plotter.maxhelp index 445eea14..efe9e753 100644 --- a/help/fluid.plotter.maxhelp +++ b/help/fluid.plotter.maxhelp @@ -6828,7 +6828,7 @@ } , { "name" : "fluid.dataloader.maxpat", - "bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/patchers", + "bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/patchers", "patcherrelativepath" : "../patchers", "type" : "JSON", "implicit" : 1 @@ -6839,21 +6839,21 @@ } , { "name" : "fluid.jit.plotter.labels2colors.js", - "bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/javascript", + "bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/javascript", "patcherrelativepath" : "../javascript", "type" : "TEXT", "implicit" : 1 } , { "name" : "fluid.jit.plotter.maxpat", - "bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/patchers", + "bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/patchers", "patcherrelativepath" : "../patchers", "type" : "JSON", "implicit" : 1 } , { "name" : "fluid.jit.plotter.resize.pworld.js", - "bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/javascript", + "bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/javascript", "patcherrelativepath" : "../javascript", "type" : "TEXT", "implicit" : 1 @@ -6876,7 +6876,7 @@ } , { "name" : "fluid.plotter.js", - "bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/jsui", + "bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/jsui", "patcherrelativepath" : "../jsui", "type" : "TEXT", "implicit" : 1 diff --git a/local_docs/fluid.audiofilesin.maxref.xml b/local_docs/fluid.audiofilesin.maxref.xml index c151199b..77d829d5 100644 --- a/local_docs/fluid.audiofilesin.maxref.xml +++ b/local_docs/fluid.audiofilesin.maxref.xml @@ -9,7 +9,7 @@ This project has received funding from the European Research Council (ERC) under the European Union’s Horizon 2020 research and innovation programme (grant agreement No 725899). --> - + Collect audio from a directory A convenience abstraction for collecting all audio files in a directory into a list. diff --git a/local_docs/fluid.buf2list.maxref.xml b/local_docs/fluid.buf2list.maxref.xml index 73f3c3b3..302b8503 100644 --- a/local_docs/fluid.buf2list.maxref.xml +++ b/local_docs/fluid.buf2list.maxref.xml @@ -9,7 +9,7 @@ This project has received funding from the European Research Council (ERC) under the European Union’s Horizon 2020 research and innovation programme (grant agreement No 725899). --> - + Copy the contents of a buffer~ to a list A simplified workflow for extracting numerical data from buffers as lists of numbers. diff --git a/local_docs/fluid.concataudiofiles.maxref.xml b/local_docs/fluid.concataudiofiles.maxref.xml index b28111fb..2f9e9f8c 100644 --- a/local_docs/fluid.concataudiofiles.maxref.xml +++ b/local_docs/fluid.concataudiofiles.maxref.xml @@ -9,7 +9,7 @@ This project has received funding from the European Research Council (ERC) under the European Union’s Horizon 2020 research and innovation programme (grant agreement No 725899). --> - + Concatenate audio files Concatenate a list of audio files into a single buffer~. diff --git a/local_docs/fluid.jit.plotter.maxref.xml b/local_docs/fluid.jit.plotter.maxref.xml index a27dfaff..8ebbae88 100644 --- a/local_docs/fluid.jit.plotter.maxref.xml +++ b/local_docs/fluid.jit.plotter.maxref.xml @@ -9,7 +9,7 @@ This project has received funding from the European Research Council (ERC) under the European Union’s Horizon 2020 research and innovation programme (grant agreement No 725899). --> - + Plot very large 2D datasets fast. An abstraction around jit.pworld that plots data in a two-dimensional graph. Similar to fluid.plotter, but more performant on large datasets. diff --git a/local_docs/fluid.list2buf.maxref.xml b/local_docs/fluid.list2buf.maxref.xml index 9ffc90e1..3663bbd9 100644 --- a/local_docs/fluid.list2buf.maxref.xml +++ b/local_docs/fluid.list2buf.maxref.xml @@ -9,7 +9,7 @@ This project has received funding from the European Research Council (ERC) under the European Union’s Horizon 2020 research and innovation programme (grant agreement No 725899). --> - + Copy a list to a buffer~ Copies the values of a list to a buffer~. diff --git a/local_docs/fluid.plotter.maxref.xml b/local_docs/fluid.plotter.maxref.xml index 64e1c1e1..c7f1e681 100644 --- a/local_docs/fluid.plotter.maxref.xml +++ b/local_docs/fluid.plotter.maxref.xml @@ -9,7 +9,7 @@ This project has received funding from the European Research Council (ERC) under the European Union’s Horizon 2020 research and innovation programme (grant agreement No 725899). --> - + Plot data in a two-dimensional graph. A JSUI object that plots data in a two-dimensional graph. diff --git a/local_docs/fluid.waveform~.maxref.xml b/local_docs/fluid.waveform~.maxref.xml index bec47960..83fc6f54 100644 --- a/local_docs/fluid.waveform~.maxref.xml +++ b/local_docs/fluid.waveform~.maxref.xml @@ -9,7 +9,7 @@ This project has received funding from the European Research Council (ERC) under the European Union’s Horizon 2020 research and innovation programme (grant agreement No 725899). --> - + Visualise audio waveforms and data. A JSUI object for visualising waveforms, feature data, slices and spectrograms. diff --git a/package-info.json.in b/package-info.json.in index b891a448..141d1630 100644 --- a/package-info.json.in +++ b/package-info.json.in @@ -3,7 +3,7 @@ "description" : "FluCoMa introduces a suite of tools to Max that can help you work with sounds and collections of them in new and flexible ways. Possibilities include slicing, decomposition and hybridisation of sounds, audio-descriptor analysis and machine learning driven musicking. The package links out to a body of educational content, tutorials, and inspirational examples from the world of FluCoMa and Max users.", "homepatcher" : "Fluid Corpus Manipulation Toolkit.maxpat", "max_version_min" : "7.0", - "name" : "FluidCorpusManipulation", + "name" : "Fluid Corpus Manipulation", "os" : { "macintosh" : { "platform" : [ "aarch64", "x64" ], diff --git a/patchers/fluid.jit.plotter.maxpat b/patchers/fluid.jit.plotter.maxpat index 62eac1d5..cf514a72 100644 --- a/patchers/fluid.jit.plotter.maxpat +++ b/patchers/fluid.jit.plotter.maxpat @@ -12595,14 +12595,14 @@ } , { "name" : "fluid.jit.plotter.labels2colors.js", - "bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/javascript", + "bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/javascript", "patcherrelativepath" : "../javascript", "type" : "TEXT", "implicit" : 1 } , { "name" : "fluid.jit.plotter.resize.pworld.js", - "bootpath" : "~/Documents/Max 8/Packages/FluidCorpusManipulation/javascript", + "bootpath" : "~/Documents/Max 8/Packages/Fluid Corpus Manipulation/javascript", "patcherrelativepath" : "../javascript", "type" : "TEXT", "implicit" : 1 diff --git a/vignettes/flucoma/automatic_buffer_and_dataset_management.maxvig.xml b/vignettes/flucoma/automatic_buffer_and_dataset_management.maxvig.xml index f3bc4db2..de866f56 100644 --- a/vignettes/flucoma/automatic_buffer_and_dataset_management.maxvig.xml +++ b/vignettes/flucoma/automatic_buffer_and_dataset_management.maxvig.xml @@ -1,6 +1,6 @@ - +

Automatic buffer~ and fluid.dataset~ management.

buffer~ and fluid.dataset~ management.

diff --git a/vignettes/flucoma/bufcompose_macros.maxvig.xml b/vignettes/flucoma/bufcompose_macros.maxvig.xml index 347dff39..ab8aa424 100644 --- a/vignettes/flucoma/bufcompose_macros.maxvig.xml +++ b/vignettes/flucoma/bufcompose_macros.maxvig.xml @@ -1,6 +1,6 @@ - +

fluid.bufcompose~ macros