commit b6c28b21cdf4cadc6aed2825a03823100adbe9f1 parent 2f8efc4f678657d388064910be83b2c932f5cea1 Author: jatinchowdhury18 <[email protected]> Date: Fri, 15 Jan 2021 22:04:32 -0800 Compile with CMake instead of Projucer (#126) * Add CMake build interface * Remove files that are no longer needed * Update build instructions * Update builds and CI * Update submodules * Build pipeline fixes * Add clang-format workflow * {Apply clang-format} * Move screenshot generator to headless build * Move benchmarks to headless mode * {Apply clang-format} * Minor tweaks to benchmarking tool * Update README * Update validation script * Update README * Update validation script Co-authored-by: Jatin Chowdhury <[email protected]> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Diffstat:
99 files changed, 1511 insertions(+), 1646 deletions(-)
diff --git a/.github/workflows/auto-format.yml b/.github/workflows/auto-format.yml @@ -0,0 +1,45 @@ +name: Auto-formatter + +on: + pull_request: + branches: + - main + - develop + paths: + - '**.cpp' + - '**.h' + + workflow_dispatch: + +jobs: + build_and_test: + if: contains(toJson(github.event.commits), '***NO_CI***') == false && contains(toJson(github.event.commits), '[ci skip]') == false && contains(toJson(github.event.commits), '[skip ci]') == false + name: Apply clang-format to pull request + runs-on: ubuntu-latest + + steps: + - name: Install Linux Deps + run: | + wget https://apt.llvm.org/llvm.sh + chmod +x llvm.sh + sudo ./llvm.sh 12 + sudo apt-get install clang-format-12 + clang-format-12 --version + + - name: Checkout code + uses: actions/checkout@v2 + with: + persist-credentials: false + fetch-depth: 0 + + - name: Run clang-format + shell: bash + working-directory: ${{github.workspace}}/Plugin + run: find Source/ -iname *.h -o -iname *.cpp | xargs clang-format-12 -style=file -verbose -i + + - name: Commit & Push changes + uses: actions-js/push@master + with: + message: "Apply clang-format" + branch: ${{ github.head_ref }} + github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml @@ -1,81 +0,0 @@ -name: CI - -on: - push: - branches: - - master - - develop - pull_request: - branches: - - master - - develop - - workflow_dispatch: - -env: - BUILD_FOLDER: - -jobs: - build_and_test: - if: contains(toJson(github.event.commits), '***NO_CI***') == false && contains(toJson(github.event.commits), '[ci skip]') == false && contains(toJson(github.event.commits), '[skip ci]') == false - name: Test module on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false # show all errors for each platform (vs. cancel jobs on error) - matrix: - os: [ubuntu-latest, macOS-latest] - - steps: - - name: Install Linux Deps - if: runner.os == 'Linux' - run: | - sudo apt-get update - sudo apt install libasound2-dev libcurl4-openssl-dev libx11-dev libxinerama-dev libxext-dev libfreetype6-dev libwebkit2gtk-4.0-dev libglu1-mesa-dev libjack-jackd2-dev - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9 - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 9 - - - name: Checkout code - uses: actions/checkout@v2 - with: - submodules: true - - - name: Build Projucer (Linux) - if: runner.os == 'Linux' - working-directory: ${{github.workspace}}/Plugin/Juce/extras/Projucer/Builds/LinuxMakefile - run: make -j4 - - - name: Build Projucer (MacOS) - if: runner.os == 'MacOS' - working-directory: ${{github.workspace}}/Plugin/Juce/extras/Projucer/Builds/MacOSX - run: xcodebuild -project Projucer.xcodeproj > /dev/null - - - name: Resave (Linux) - if: runner.os == 'Linux' - run: | - PROJUCER="${{github.workspace}}/Plugin/Juce/extras/Projucer/Builds/LinuxMakefile/build/Projucer" - $PROJUCER --set-global-search-path linux defaultJuceModulePath ${{github.workspace}}/Plugin/Juce/modules - $PROJUCER --set-global-search-path linux vstLegacyPath ${{github.workspace}}/Plugin/Juce/VST2_SDK - $PROJUCER --resave Plugin/CHOWTapeModel.jucer - - - name: Resave (MacOS) - if: runner.os == 'MacOS' - run: | - PROJUCER="${{github.workspace}}/Plugin/JUCE/extras/Projucer/Builds/MacOSX/build/Debug/Projucer.app/Contents/MacOS/Projucer" - $PROJUCER --set-global-search-path osx defaultJuceModulePath ${{github.workspace}}/Plugin/Juce/modules - $PROJUCER --set-global-search-path osx vstLegacyPath ${{github.workspace}}/Plugin/Juce/VST2_SDK - $PROJUCER --resave Plugin/CHOWTapeModel.jucer - - - name: Build (Linux) - if: runner.os == 'Linux' - working-directory: ${{github.workspace}}/Plugin - run: bash build_linux.sh - - - name: Build (MacOS) - if: runner.os == 'MacOS' - working-directory: ${{github.workspace}}/Plugin/Builds/MacOSX - run: | - xcodebuild -project CHOWTapeModel.xcodeproj/ clean - xcodebuild -project CHOWTapeModel.xcodeproj/ -configuration Release - - # - name: Validate - # run: bash validate.sh diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml @@ -0,0 +1,61 @@ +name: CI + +on: + push: + branches: + - master + - develop + paths: + - 'Plugin/**' + pull_request: + branches: + - master + - develop + paths: + - 'Plugin/**' + + workflow_dispatch: + +jobs: + build_and_test: + if: contains(toJson(github.event.commits), '***NO_CI***') == false && contains(toJson(github.event.commits), '[ci skip]') == false && contains(toJson(github.event.commits), '[skip ci]') == false + name: Test plugin on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false # show all errors for each platform (vs. cancel jobs on error) + matrix: + os: [ubuntu-latest, windows-latest, macOS-latest] + + steps: + - name: Install Linux Deps + if: runner.os == 'Linux' + run: | + sudo apt-get update + sudo apt install libasound2-dev libcurl4-openssl-dev libx11-dev libxinerama-dev libxext-dev libfreetype6-dev libwebkit2gtk-4.0-dev libglu1-mesa-dev libjack-jackd2-dev + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 9 + + - name: Get latest CMake + uses: lukka/get-cmake@latest + + - name: Checkout code + uses: actions/checkout@v2 + with: + submodules: true + + # - name: Setup debug session + # uses: mxschmitt/action-tmate@v3 + + - name: Configure + shell: bash + working-directory: ${{github.workspace}}/Plugin + run: cmake -Bbuild + + - name: Build + shell: bash + working-directory: ${{github.workspace}}/Plugin + run: cmake --build build --config Release --parallel + + - name: Pluginval + if: runner.os == 'Windows' || runner.os == 'MacOS' + run: bash validate.sh diff --git a/.gitignore b/.gitignore @@ -14,6 +14,7 @@ Refs Builds BinaryData.h BinaryData*.cpp +build JuceLibraryCode LV2.mak diff --git a/.gitmodules b/.gitmodules @@ -1,6 +1,6 @@ [submodule "Plugin/Juce"] path = Plugin/Juce - url = https://github.com/jatinchowdhury18/JUCE.git + url = https://github.com/Chowdhury-DSP/DISTRHO-JUCE.git [submodule "Plugin/foleys_gui_magic"] path = Plugin/foleys_gui_magic url = https://github.com/jatinchowdhury18/foleys_gui_magic.git diff --git a/BUILDING.md b/BUILDING.md @@ -1,6 +1,6 @@ # Instructions For Building -CHOW Tape is built using the [JUCE](https://github.com/juce-framework/JUCE) framework, with [PluginGUIMagic](https://github.com/ffAudio/PluginGUIMagic) -for the UI. To build from scratch, you must first clone the repository +CHOW Tape is built using [CMake](https://cmake.org), along with the [JUCE](https://github.com/juce-framework/JUCE) framework, and [PluginGUIMagic](https://github.com/ffAudio/PluginGUIMagic) +for the UI. JUCE and PluginGUIMagic are included in the repository, but CMake must be installed before attempting to build. CHOW Tape also uses the CMake build tool To build from scratch, you must first clone the repository and initialize the submodules using the following commands: ```bash @@ -14,14 +14,15 @@ cd AnalogTapeModel/Plugin git submodule update --init --recursive ``` -## Building on MacOS/Windows -1. Navigate to `JUCE/extras/Projucer/Builds/` -2. Build the Projucer using XCode (Mac) or Visual Studio (Windows) -3. From the Projucer, open CHOWTapeModel.jucer -4. Select "Save and open in IDE" -5. Build CHOW Tape +Next you can generate the builds with CMake: -## Building on Linux +```bash +cd Plugin/ +cmake -Bbuild +cmake --build build/ --config Release +``` + +## Linux Dependencies The Linux build utilises the following dependencies: - libasound - libxcursor @@ -41,22 +42,5 @@ Depending on your Linux distribution, you may also need to install: - libcurl - python3 (only if you plan to build LV2) -Then to build the plugin (Standalone, VST3, LV2), run -``` -cd Plugin/ && bash build_linux.sh -``` - -If you would like to customise which plugin formats are -built, you may edit line 23 of `build_linux.sh`, to select -your desired plugin format targets (LV2, VST, VST3, Standalone). -```bash -CONFIG=Release make LV2 VST3 Standalone # replace this with a list of your preferred targets -``` - -Builds can be found in `Builds/LinuxMakefile/build/`. - ## Building with the GUI Editor -If you need to make changes to the GUI, you can build the -plugin with Foley's Magic Editor attached. From the Projucer, -navigate to `modules -> foleys_gui_magic`, and enable -`FOLEYS_SHOW_GUI_EDITOR_PALLETTE`. +If you need to make changes to the GUI, you can build the plugin with Foley's Magic Editor attached. In `Plugin/CMakeLists.txt`, set `FOLEYS_SHOW_GUI_EDITOR_PALLETTE` equal to 1. diff --git a/CHANGELOG.md b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. + +## [Unreleased] +- Migrated build pipeline to CMake. +- Fixed gain staging bug in Renoise. ## [2.7.0] - 2020-11-25 - Added new hysteresis mode: State Transition Network (STN) - Updated Loss Filters to improve frequency response and phase response. diff --git a/Plugin/.clang-format b/Plugin/.clang-format @@ -0,0 +1,75 @@ +--- +AccessModifierOffset: -4 +AlignAfterOpenBracket: Align +AlignConsecutiveAssignments: false +AlignConsecutiveDeclarations: false +AlignEscapedNewlines: Left +AlignOperands: Align +AlignTrailingComments: false +AllowAllParametersOfDeclarationOnNextLine: false +AllowShortBlocksOnASingleLine: Never +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: All +AllowShortIfStatementsOnASingleLine: Never +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: Yes +BinPackArguments: false +BinPackParameters: false +BreakAfterJavaFieldAnnotations: false +BreakBeforeBinaryOperators: NonAssignment +BreakBeforeBraces: Allman +BreakBeforeTernaryOperators: true +BreakConstructorInitializersBeforeComma: false +BreakStringLiterals: false +ColumnLimit: 0 +ConstructorInitializerAllOnOneLineOrOnePerLine: true +ConstructorInitializerIndentWidth: 4 +ContinuationIndentWidth: 4 +Cpp11BracedListStyle: false +DerivePointerAlignment: false +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +ForEachMacros: ['forEachXmlChildElement'] +IndentCaseLabels: true +IndentWidth: 4 +IndentWrappedFunctionNames: true +KeepEmptyLinesAtTheStartOfBlocks: false +Language: Cpp +MaxEmptyLinesToKeep: 1 +NamespaceIndentation: Inner +PointerAlignment: Left +ReflowComments: false +SortIncludes: true +SpaceAfterCStyleCast: true +SpaceAfterLogicalNot: true +SpaceBeforeAssignmentOperators: true +SpaceBeforeCpp11BracedList: true +SpaceBeforeParens: NonEmptyParentheses +SpaceInEmptyParentheses: false +SpaceBeforeInheritanceColon: true +SpacesInAngles: false +SpacesInCStyleCastParentheses: false +SpacesInContainerLiterals: true +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: "c++17" +TabWidth: 4 +UseTab: Never +--- +Language: ObjC +BasedOnStyle: Chromium +AlignTrailingComments: true +BreakBeforeBraces: Allman +ColumnLimit: 0 +IndentWidth: 4 +KeepEmptyLinesAtTheStartOfBlocks: false +ObjCSpaceAfterProperty: true +ObjCSpaceBeforeProtocolList: true +PointerAlignment: Left +SpacesBeforeTrailingComments: 1 +TabWidth: 4 +UseTab: Never +... diff --git a/Plugin/Bench/CHOWTapeBench.jucer b/Plugin/Bench/CHOWTapeBench.jucer @@ -1,79 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<JUCERPROJECT id="k9sHIZ" name="CHOWTapeBench" projectType="consoleapp" useAppConfig="0" - addUsingNamespaceToJuceHeader="0" jucerFormatVersion="1"> - <MAINGROUP id="KOQkEi" name="CHOWTapeBench"> - <GROUP id="{C7023DBC-3FC3-D40D-C17D-322846554284}" name="Source"> - <FILE id="HsSjYU" name="Main.cpp" compile="1" resource="0" file="Source/Main.cpp"/> - </GROUP> - </MAINGROUP> - <JUCEOPTIONS JUCE_STRICT_REFCOUNTEDPOINTER="1" JUCE_PLUGINHOST_VST3="1"/> - <EXPORTFORMATS> - <LINUX_MAKE targetFolder="Builds/LinuxMakefile"> - <CONFIGURATIONS> - <CONFIGURATION isDebug="1" name="Debug" targetName="CHOWTapeBench"/> - <CONFIGURATION isDebug="0" name="Release" targetName="CHOWTapeBench"/> - </CONFIGURATIONS> - <MODULEPATHS> - <MODULEPATH id="juce_audio_processors" path="../Juce/modules"/> - <MODULEPATH id="juce_events" path="../Juce/modules"/> - <MODULEPATH id="juce_core" path="../Juce/modules"/> - <MODULEPATH id="juce_data_structures" path="../Juce/modules"/> - <MODULEPATH id="juce_gui_extra" path="../Juce/modules"/> - <MODULEPATH id="juce_gui_basics" path="../Juce/modules"/> - <MODULEPATH id="juce_graphics" path="../Juce/modules"/> - <MODULEPATH id="juce_audio_basics" path="../Juce/modules"/> - <MODULEPATH id="juce_audio_formats" path="../Juce/modules"/> - </MODULEPATHS> - </LINUX_MAKE> - <VS2017 targetFolder="Builds/VisualStudio2017"> - <CONFIGURATIONS> - <CONFIGURATION isDebug="1" name="Debug" targetName="CHOWTapeBench"/> - <CONFIGURATION isDebug="0" name="Release" targetName="CHOWTapeBench"/> - </CONFIGURATIONS> - <MODULEPATHS> - <MODULEPATH id="juce_audio_processors" path="../Juce/modules"/> - <MODULEPATH id="juce_events" path="../Juce/modules"/> - <MODULEPATH id="juce_core" path="../Juce/modules"/> - <MODULEPATH id="juce_data_structures" path="../Juce/modules"/> - <MODULEPATH id="juce_gui_extra" path="../Juce/modules"/> - <MODULEPATH id="juce_gui_basics" path="../Juce/modules"/> - <MODULEPATH id="juce_graphics" path="../Juce/modules"/> - <MODULEPATH id="juce_audio_basics" path="../Juce/modules"/> - <MODULEPATH id="juce_audio_formats" path="../Juce/modules"/> - </MODULEPATHS> - </VS2017> - <XCODE_MAC targetFolder="Builds/MacOSX"> - <CONFIGURATIONS> - <CONFIGURATION isDebug="1" name="Debug" targetName="CHOWTapeBench"/> - <CONFIGURATION isDebug="0" name="Release" targetName="CHOWTapeBench"/> - </CONFIGURATIONS> - <MODULEPATHS> - <MODULEPATH id="juce_audio_processors" path="../Juce/modules"/> - <MODULEPATH id="juce_events" path="../Juce/modules"/> - <MODULEPATH id="juce_core" path="../Juce/modules"/> - <MODULEPATH id="juce_data_structures" path="../Juce/modules"/> - <MODULEPATH id="juce_gui_extra" path="../Juce/modules"/> - <MODULEPATH id="juce_gui_basics" path="../Juce/modules"/> - <MODULEPATH id="juce_graphics" path="../Juce/modules"/> - <MODULEPATH id="juce_audio_basics" path="../Juce/modules"/> - <MODULEPATH id="juce_audio_formats" path="../Juce/modules"/> - </MODULEPATHS> - </XCODE_MAC> - </EXPORTFORMATS> - <MODULES> - <MODULE id="juce_audio_basics" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - <MODULE id="juce_audio_formats" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - <MODULE id="juce_audio_processors" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - <MODULE id="juce_core" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - <MODULE id="juce_data_structures" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - <MODULE id="juce_events" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - <MODULE id="juce_graphics" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - <MODULE id="juce_gui_basics" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - <MODULE id="juce_gui_extra" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - </MODULES> - <LIVE_SETTINGS> - <WINDOWS/> - <LINUX/> - </LIVE_SETTINGS> -</JUCERPROJECT> diff --git a/Plugin/Bench/Source/Main.cpp b/Plugin/Bench/Source/Main.cpp @@ -1,201 +0,0 @@ -#include <JuceHeader.h> -#include <iostream> - -namespace -{ - constexpr double pluginSampleRate = 44100.0; - constexpr int samplesPerBlock = 256; - constexpr int numChannels = 2; -} - -using namespace juce; - -File getRootFolder(); -void getAudioFile(AudioBuffer<float>& buffer); -File getPluginFile(); -std::unique_ptr<AudioPluginInstance> getPlugin (String file); -void createRandomAudioInput (AudioBuffer<float>& buffer, double lengthSeconds); -double timeAudioProcess (AudioPluginInstance* plugin, AudioBuffer<float>& audio, const int blockSize); - -int main (int argc, char* argv[]) -{ - ignoreUnused (argc, argv); - - ScopedJuceInitialiser_GUI scopedJuce; - - std::cout << "Loading plugin..." << std::endl; - auto pluginFile = getPluginFile(); - auto plugin = getPlugin (pluginFile.getFullPathName()); - - if (plugin == nullptr) - return 1; - - std::cout << "Loading audio file..." << std::endl; - AudioBuffer<float> audio; - getAudioFile (audio); - const double audioLength = audio.getNumSamples() / pluginSampleRate; // seconds - // std::cout << "Audio file is " << audioLength << " seconds" << std::endl; - - std::cout << "Setting parameters..." << std::endl; - auto params = plugin->getParameters(); - for (auto param : params) - { - if (param->getName (10) == "Oversampling") - { - param->setValue (3.0f / 4.0f); // 8x - std::cout << "Setting parameter " << param->getName (10) - << ": " << param->getText (param->getValue(), 1024) << std::endl; - } - - if (param->getName (10) == "Mode") - { - param->setValue (4.0f / 5.0f); // STN - std::cout << "Setting parameter " << param->getName (10) - << ": " << param->getText (param->getValue(), 1024) << std::endl; - } - } - - // process audio - std::cout << "Processing audio..." << std::endl; - plugin->prepareToPlay (pluginSampleRate, samplesPerBlock); - auto time = timeAudioProcess (plugin.get(), audio, samplesPerBlock); - plugin->releaseResources(); - - // print results - std::cout << "Results:" << std::endl; - std::cout << audioLength / time << "x real-time" << std::endl; - std::cout << time << std::endl; - - return 0; -} - -std::unique_ptr<AudioPluginInstance> getPlugin (String file) -{ - AudioPluginFormatManager pluginManager; - pluginManager.addDefaultFormats(); - - OwnedArray<PluginDescription> plugins; - KnownPluginList pluginList; - - // attempt to load plugin from file - File pluginFile; - if (! File::isAbsolutePath (String(file))) - pluginFile = File (File::getCurrentWorkingDirectory().getFullPathName() + "/" + file); - else - pluginFile = File (file); - pluginList.scanAndAddDragAndDroppedFiles (pluginManager, StringArray (pluginFile.getFullPathName()), plugins); - - if (plugins.isEmpty()) // check if loaded - { - std::cout << "Error: unable to load plugin" << std::endl; - return {}; - } - - // create plugin instance - String error ("Unable to load plugin"); - auto plugin = pluginManager.createPluginInstance (*plugins.getFirst(), 44100.0, 256, error); - - return std::move (plugin); -} - -void createRandomAudioInput (AudioBuffer<float>& buffer, double lengthSeconds) -{ - const int numSamples = int (lengthSeconds * pluginSampleRate); - buffer.setSize (numChannels, numSamples); - - Random rand; - for (int ch = 0; ch < numChannels; ++ch) - { - auto* x = buffer.getWritePointer (ch); - for (int n = 0; n < numSamples; ++n) - { - x[n] = rand.nextFloat() * 2.0f - 1.0f; - } - } -} - -double timeAudioProcess (AudioPluginInstance* plugin, AudioBuffer<float>& audio, const int blockSize) -{ - Time time; - - auto totalNumSamples = audio.getNumSamples(); - int samplePtr = 0; - MidiBuffer midi; - - auto start = time.getMillisecondCounterHiRes(); - while (totalNumSamples > 0) - { - auto curBlockSize = jmin (totalNumSamples, blockSize); - totalNumSamples -= curBlockSize; - - AudioBuffer<float> curBuff (audio.getArrayOfWritePointers(), numChannels, samplePtr, curBlockSize); - plugin->processBlock (curBuff, midi); - - samplePtr += curBlockSize; - } - - return (time.getMillisecondCounterHiRes() - start) / 1000.0; -} - -File getPluginFile() -{ - File rootFolder = getRootFolder(); - -#ifdef JUCE_WINDOWS - File pluginFile = rootFolder.getChildFile ("Builds/VisualStudio2017/x64/Release/VST3/CHOWTapeModel.vst3"); -#endif - -#ifdef JUCE_MAC - File pluginFile = rootFolder.getChildFile ("Builds/MacOSX/build/Release/CHOWTapeModel.vst3"); -#endif - -#ifdef JUCE_LINUX - File pluginFile = rootFolder.getChildFile ("Builds/LinuxMakefile/build/CHOWTapeModel.vst3"); -#endif - - // std::cout << "Plugin File: " << pluginFile.getFullPathName() << std::endl; - - jassert (pluginFile.exists()); - - return pluginFile; -} - -File getRootFolder() -{ - File appFile = File::getSpecialLocation (File::currentApplicationFile); - -#ifdef JUCE_WINDOWS - int numParentsToRoot = 7; -#endif - -#ifdef JUCE_MAC - int numParentsToRoot = 6; -#endif - -#ifdef JUCE_LINUX - int numParentsToRoot = 5; -#endif - - File rootFolder = File (appFile); - for (int i = 0; i < numParentsToRoot; ++i) - rootFolder = File (rootFolder.getParentDirectory()); - - // std::cout << "Root Folder: " << rootFolder.getFullPathName() << std::endl; - - return rootFolder; -} - -void getAudioFile(AudioBuffer<float>& buffer) -{ - File rootFolder = getRootFolder(); - File audioFile = rootFolder.getParentDirectory().getChildFile ("Testing/Canada_Dry.wav"); - - AudioFormatManager formatManager; - formatManager.registerBasicFormats(); - - std::unique_ptr<InputStream> inputStream = audioFile.createInputStream(); - std::unique_ptr<AudioFormatReader> reader (formatManager.createReaderFor (std::move (inputStream))); - - buffer.setSize (reader->numChannels, (int) reader->lengthInSamples); - reader->read (buffer.getArrayOfWritePointers(), buffer.getNumChannels(), 0, buffer.getNumSamples()); -} diff --git a/Plugin/CHOWTapeModel.jucer b/Plugin/CHOWTapeModel.jucer @@ -1,296 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<JUCERPROJECT id="jDoXPz" name="CHOWTapeModel" projectType="audioplug" version="2.7.0" - pluginFormats="buildAU,buildStandalone,buildVST,buildVST3" cppLanguageStandard="17" - companyName="chowdsp" companyEmail="[email protected]" pluginManufacturerCode="Chow" - reportAppUsage="0" jucerFormatVersion="1"> - <MAINGROUP id="pXbPvR" name="CHOWTapeModel"> - <GROUP id="{0178B10A-4A61-796A-5AB2-915D32AF6EEE}" name="Source"> - <GROUP id="{8D673967-9B5D-8254-9062-4C4B14D4EAD9}" name="GUI"> - <GROUP id="{1765C43E-7671-A0DE-6CE7-A10A24110269}" name="Assets"> - <FILE id="rW7Fbv" name="Background.svg" compile="0" resource="1" file="Source/GUI/Assets/Background.svg"/> - <FILE id="DzcyPN" name="gui.xml" compile="0" resource="1" file="Source/GUI/Assets/gui.xml"/> - <FILE id="xzpwn3" name="knob.svg" compile="0" resource="1" file="Source/GUI/Assets/knob.svg"/> - <FILE id="VVaf9c" name="pointer.svg" compile="0" resource="1" file="Source/GUI/Assets/pointer.svg"/> - <FILE id="kPu6oB" name="powerswitch.svg" compile="0" resource="1" file="Source/GUI/Assets/powerswitch.svg"/> - <FILE id="th5YSa" name="RobotoCondensed-Bold.ttf" compile="0" resource="1" - file="Source/GUI/Assets/RobotoCondensed-Bold.ttf"/> - <FILE id="bQP3yl" name="RobotoCondensed-Regular.ttf" compile="0" resource="1" - file="Source/GUI/Assets/RobotoCondensed-Regular.ttf"/> - </GROUP> - <FILE id="XNEbSl" name="AutoUpdating.cpp" compile="1" resource="0" - file="Source/GUI/AutoUpdating.cpp"/> - <FILE id="u8IfBD" name="AutoUpdating.h" compile="0" resource="0" file="Source/GUI/AutoUpdating.h"/> - <FILE id="rOj90C" name="InfoComp.cpp" compile="1" resource="0" file="Source/GUI/InfoComp.cpp"/> - <FILE id="FxvDV3" name="InfoComp.h" compile="0" resource="0" file="Source/GUI/InfoComp.h"/> - <FILE id="AG1VNL" name="LightMeter.cpp" compile="1" resource="0" file="Source/GUI/LightMeter.cpp"/> - <FILE id="F1yjo4" name="LightMeter.h" compile="0" resource="0" file="Source/GUI/LightMeter.h"/> - <FILE id="SYzWcj" name="MixGroupViz.cpp" compile="1" resource="0" file="Source/GUI/MixGroupViz.cpp"/> - <FILE id="YzAgWK" name="MixGroupViz.h" compile="0" resource="0" file="Source/GUI/MixGroupViz.h"/> - <FILE id="IgOtsG" name="MyLNF.cpp" compile="1" resource="0" file="Source/GUI/MyLNF.cpp"/> - <FILE id="pj6eEc" name="MyLNF.h" compile="0" resource="0" file="Source/GUI/MyLNF.h"/> - <FILE id="Y0Fi0f" name="ScreenshotHelper.cpp" compile="1" resource="0" - file="Source/GUI/ScreenshotHelper.cpp"/> - <FILE id="Vw0Q80" name="ScreenshotHelper.h" compile="0" resource="0" - file="Source/GUI/ScreenshotHelper.h"/> - <FILE id="jFuKe3" name="OnOffManager.cpp" compile="1" resource="0" - file="Source/GUI/OnOffManager.cpp"/> - <FILE id="yLv4BP" name="OnOffManager.h" compile="0" resource="0" file="Source/GUI/OnOffManager.h"/> - <FILE id="dOs7G8" name="PowerButton.cpp" compile="1" resource="0" file="Source/GUI/PowerButton.cpp"/> - <FILE id="tNdX49" name="PowerButton.h" compile="0" resource="0" file="Source/GUI/PowerButton.h"/> - <FILE id="yy3bQ7" name="TapeScope.cpp" compile="1" resource="0" file="Source/GUI/TapeScope.cpp"/> - <FILE id="zDg8Lf" name="TapeScope.h" compile="0" resource="0" file="Source/GUI/TapeScope.h"/> - <FILE id="WfCYvA" name="TitleComp.cpp" compile="1" resource="0" file="Source/GUI/TitleComp.cpp"/> - <FILE id="aoz8GN" name="TitleComp.h" compile="0" resource="0" file="Source/GUI/TitleComp.h"/> - <FILE id="oFI05X" name="TooltipComp.cpp" compile="1" resource="0" file="Source/GUI/TooltipComp.cpp"/> - <FILE id="BpGwTA" name="TooltipComp.h" compile="0" resource="0" file="Source/GUI/TooltipComp.h"/> - </GROUP> - <GROUP id="{DCA33FEB-7151-818B-57ED-905929FEF150}" name="MixGroups"> - <FILE id="plu32m" name="MixGroupsController.cpp" compile="1" resource="0" - file="Source/MixGroups/MixGroupsController.cpp"/> - <FILE id="vwS6BX" name="MixGroupsController.h" compile="0" resource="0" - file="Source/MixGroups/MixGroupsController.h"/> - <FILE id="yc5D3k" name="MixGroupsSharedData.cpp" compile="1" resource="0" - file="Source/MixGroups/MixGroupsSharedData.cpp"/> - <FILE id="hGI0mn" name="MixGroupsSharedData.h" compile="0" resource="0" - file="Source/MixGroups/MixGroupsSharedData.h"/> - </GROUP> - <GROUP id="{71C1FCA8-E7B0-3B66-1340-F140C452FF6F}" name="Presets"> - <GROUP id="{AB6F221D-98B5-9782-2241-321BA5DFB83C}" name="PresetConfigs"> - <FILE id="GvUTP4" name="Default.chowpreset" compile="0" resource="1" - file="Source/Presets/PresetConfigs/Default.chowpreset"/> - <FILE id="BPj68R" name="LoFi.chowpreset" compile="0" resource="1" file="Source/Presets/PresetConfigs/LoFi.chowpreset"/> - <FILE id="uAXu5z" name="OldTape.chowpreset" compile="0" resource="1" - file="Source/Presets/PresetConfigs/OldTape.chowpreset"/> - <FILE id="U14vbg" name="SNK_BassPusher.chowpreset" compile="0" resource="1" - file="Source/Presets/PresetConfigs/SNK_BassPusher.chowpreset"/> - <FILE id="k622ua" name="SNK_Chorus3.chowpreset" compile="0" resource="1" - file="Source/Presets/PresetConfigs/SNK_Chorus3.chowpreset"/> - <FILE id="MOk9cf" name="SNK_Chorus4.chowpreset" compile="0" resource="1" - file="Source/Presets/PresetConfigs/SNK_Chorus4.chowpreset"/> - <FILE id="LktNck" name="SNK_Chorus2.chowpreset" compile="0" resource="1" - file="Source/Presets/PresetConfigs/SNK_Chorus2.chowpreset"/> - <FILE id="Tft4Nf" name="SNK_CleanFat.chowpreset" compile="0" resource="1" - file="Source/Presets/PresetConfigs/SNK_CleanFat.chowpreset"/> - <FILE id="JIJgNs" name="SNK_Fat2.chowpreset" compile="0" resource="1" - file="Source/Presets/PresetConfigs/SNK_Fat2.chowpreset"/> - <FILE id="MRXbHr" name="SNK_Gritty.chowpreset" compile="0" resource="1" - file="Source/Presets/PresetConfigs/SNK_Gritty.chowpreset"/> - <FILE id="WbTlM4" name="SNK_Gritty2.chowpreset" compile="0" resource="1" - file="Source/Presets/PresetConfigs/SNK_Gritty2.chowpreset"/> - <FILE id="oYWApp" name="SNK_lofi.chowpreset" compile="0" resource="1" - file="Source/Presets/PresetConfigs/SNK_lofi.chowpreset"/> - <FILE id="dfvIsA" name="SNK_SlightlyWobbly.chowpreset" compile="0" - resource="1" file="Source/Presets/PresetConfigs/SNK_SlightlyWobbly.chowpreset"/> - <FILE id="RwaoWX" name="TC260.chowpreset" compile="0" resource="1" - file="Source/Presets/PresetConfigs/TC260.chowpreset"/> - <FILE id="cwOBOG" name="Underbiased.chowpreset" compile="0" resource="1" - file="Source/Presets/PresetConfigs/Underbiased.chowpreset"/> - <FILE id="uL6YwZ" name="WoozyChorus.chowpreset" compile="0" resource="1" - file="Source/Presets/PresetConfigs/WoozyChorus.chowpreset"/> - </GROUP> - <FILE id="ByxTdI" name="PresetComp.cpp" compile="1" resource="0" file="Source/Presets/PresetComp.cpp"/> - <FILE id="jFQg5e" name="PresetComp.h" compile="0" resource="0" file="Source/Presets/PresetComp.h"/> - <FILE id="u8p0u2" name="PresetManager.cpp" compile="1" resource="0" - file="Source/Presets/PresetManager.cpp"/> - <FILE id="hN3w9Y" name="PresetManager.h" compile="0" resource="0" file="Source/Presets/PresetManager.h"/> - </GROUP> - <GROUP id="{43BBFC88-4D0A-01B8-2635-3748470B94F4}" name="Processors"> - <GROUP id="{2F544AA2-63D9-E54A-A753-2E6249E85E60}" name="Chew"> - <FILE id="S5eP4b" name="ChewProcessor.cpp" compile="1" resource="0" - file="Source/Processors/Chew/ChewProcessor.cpp"/> - <FILE id="shEGgj" name="ChewProcessor.h" compile="0" resource="0" file="Source/Processors/Chew/ChewProcessor.h"/> - <FILE id="gw6Axu" name="Dropout.h" compile="0" resource="0" file="Source/Processors/Chew/Dropout.h"/> - </GROUP> - <GROUP id="{344B63D7-2DBC-F9D2-ACD7-1B0671D4D024}" name="Degrade"> - <FILE id="ac7jRp" name="DegradeFilter.h" compile="0" resource="0" file="Source/Processors/Degrade/DegradeFilter.h"/> - <FILE id="qWC1GC" name="DegradeNoise.h" compile="0" resource="0" file="Source/Processors/Degrade/DegradeNoise.h"/> - <FILE id="VIsORm" name="DegradeProcessor.cpp" compile="1" resource="0" - file="Source/Processors/Degrade/DegradeProcessor.cpp"/> - <FILE id="pXjWJR" name="DegradeProcessor.h" compile="0" resource="0" - file="Source/Processors/Degrade/DegradeProcessor.h"/> - </GROUP> - <GROUP id="{6052B1B0-83EF-DBFA-991C-FC0B47A949C9}" name="Hysteresis"> - <GROUP id="{A4185D0A-8289-D298-5C8F-340D5F34536D}" name="RTNeural"> - <FILE id="VYlPdE" name="activation.h" compile="0" resource="0" file="Source/Processors/Hysteresis/RTNeural/src/activation.h"/> - <FILE id="Rvs0tO" name="dense.h" compile="0" resource="0" file="Source/Processors/Hysteresis/RTNeural/src/dense.h"/> - <FILE id="waQbof" name="dense_eigen.h" compile="0" resource="0" file="Source/Processors/Hysteresis/RTNeural/src/dense_eigen.h"/> - <FILE id="OB1nyt" name="gru.cpp" compile="1" resource="0" file="Source/Processors/Hysteresis/RTNeural/src/gru.cpp"/> - <FILE id="CZKQpU" name="gru.h" compile="0" resource="0" file="Source/Processors/Hysteresis/RTNeural/src/gru.h"/> - <FILE id="mBKfVC" name="gru_eigen.cpp" compile="1" resource="0" file="Source/Processors/Hysteresis/RTNeural/src/gru_eigen.cpp"/> - <FILE id="AGa9yU" name="gru_eigen.h" compile="0" resource="0" file="Source/Processors/Hysteresis/RTNeural/src/gru_eigen.h"/> - <FILE id="idA6lp" name="Json2RnnParser.cpp" compile="1" resource="0" - file="Source/Processors/Hysteresis/RTNeural/src/Json2RnnParser.cpp"/> - <FILE id="ZN3kzT" name="Json2RnnParser.h" compile="0" resource="0" - file="Source/Processors/Hysteresis/RTNeural/src/Json2RnnParser.h"/> - <FILE id="G6NDg6" name="Layer.h" compile="0" resource="0" file="Source/Processors/Hysteresis/RTNeural/src/Layer.h"/> - <FILE id="b8hfRa" name="Model.h" compile="0" resource="0" file="Source/Processors/Hysteresis/RTNeural/src/Model.h"/> - </GROUP> - <GROUP id="{875CE76D-E0F5-EAD7-C837-F2D490D96C63}" name="STN_Models"> - <FILE id="PwcQg5" name="hyst_width_0.json" compile="0" resource="1" - file="Source/Processors/Hysteresis/STN_Models/hyst_width_0.json"/> - <FILE id="tOwEot" name="hyst_width_10.json" compile="0" resource="1" - file="Source/Processors/Hysteresis/STN_Models/hyst_width_10.json"/> - <FILE id="VCIoxi" name="hyst_width_20.json" compile="0" resource="1" - file="Source/Processors/Hysteresis/STN_Models/hyst_width_20.json"/> - <FILE id="HSGyJo" name="hyst_width_30.json" compile="0" resource="1" - file="Source/Processors/Hysteresis/STN_Models/hyst_width_30.json"/> - <FILE id="TQ4HqA" name="hyst_width_40.json" compile="0" resource="1" - file="Source/Processors/Hysteresis/STN_Models/hyst_width_40.json"/> - <FILE id="d8DzmO" name="hyst_width_50.json" compile="0" resource="1" - file="Source/Processors/Hysteresis/STN_Models/hyst_width_50.json"/> - <FILE id="iLqOdz" name="hyst_width_60.json" compile="0" resource="1" - file="Source/Processors/Hysteresis/STN_Models/hyst_width_60.json"/> - <FILE id="P39ERI" name="hyst_width_70.json" compile="0" resource="1" - file="Source/Processors/Hysteresis/STN_Models/hyst_width_70.json"/> - <FILE id="CCn8WH" name="hyst_width_80.json" compile="0" resource="1" - file="Source/Processors/Hysteresis/STN_Models/hyst_width_80.json"/> - <FILE id="ihUN3y" name="hyst_width_90.json" compile="0" resource="1" - file="Source/Processors/Hysteresis/STN_Models/hyst_width_90.json"/> - <FILE id="xtDfPX" name="hyst_width_100.json" compile="0" resource="1" - file="Source/Processors/Hysteresis/STN_Models/hyst_width_100.json"/> - </GROUP> - <FILE id="l6IKp3" name="DCBlocker.h" compile="0" resource="0" file="Source/Processors/Hysteresis/DCBlocker.h"/> - <FILE id="Qe4tlV" name="HysteresisProcessing.cpp" compile="1" resource="0" - file="Source/Processors/Hysteresis/HysteresisProcessing.cpp"/> - <FILE id="OYS18C" name="HysteresisProcessing.h" compile="0" resource="0" - file="Source/Processors/Hysteresis/HysteresisProcessing.h"/> - <FILE id="Afas5v" name="HysteresisProcessor.cpp" compile="1" resource="0" - file="Source/Processors/Hysteresis/HysteresisProcessor.cpp"/> - <FILE id="TRDp2E" name="HysteresisProcessor.h" compile="0" resource="0" - file="Source/Processors/Hysteresis/HysteresisProcessor.h"/> - <FILE id="yyRNO0" name="HysteresisSTN.cpp" compile="1" resource="0" - file="Source/Processors/Hysteresis/HysteresisSTN.cpp"/> - <FILE id="ELL2Q2" name="HysteresisSTN.h" compile="0" resource="0" file="Source/Processors/Hysteresis/HysteresisSTN.h"/> - <FILE id="yqa9LH" name="ToneControl.cpp" compile="1" resource="0" file="Source/Processors/Hysteresis/ToneControl.cpp"/> - <FILE id="vd8RTB" name="ToneControl.h" compile="0" resource="0" file="Source/Processors/Hysteresis/ToneControl.h"/> - <FILE id="Gxo9aB" name="ToneFilter.h" compile="0" resource="0" file="Source/Processors/Hysteresis/ToneFilter.h"/> - </GROUP> - <GROUP id="{7D3433B2-4187-FE49-3315-E6F91824ED66}" name="Input_Filters"> - <FILE id="UEN8uY" name="InputFilters.cpp" compile="1" resource="0" - file="Source/Processors/Input_Filters/InputFilters.cpp"/> - <FILE id="WU560t" name="InputFilters.h" compile="0" resource="0" file="Source/Processors/Input_Filters/InputFilters.h"/> - <FILE id="TgI8iY" name="LinkwitzRileyFilter.h" compile="0" resource="0" - file="Source/Processors/Input_Filters/LinkwitzRileyFilter.h"/> - </GROUP> - <GROUP id="{37F4BCFA-28D3-CD4D-17AF-3C696E7EC8DA}" name="Loss_Effects"> - <FILE id="gJA2Gi" name="FIRFilter.h" compile="0" resource="0" file="Source/Processors/Loss_Effects/FIRFilter.h"/> - <FILE id="gjr7ub" name="LossFilter.cpp" compile="1" resource="0" file="Source/Processors/Loss_Effects/LossFilter.cpp"/> - <FILE id="ZNErgZ" name="LossFilter.h" compile="0" resource="0" file="Source/Processors/Loss_Effects/LossFilter.h"/> - </GROUP> - <GROUP id="{0C000F30-53FD-3EFB-FAEA-6321B08AE56A}" name="Timing_Effects"> - <FILE id="cVSIAR" name="Flutter.cpp" compile="1" resource="0" file="Source/Processors/Timing_Effects/Flutter.cpp"/> - <FILE id="Wz3lz6" name="Flutter.h" compile="0" resource="0" file="Source/Processors/Timing_Effects/Flutter.h"/> - </GROUP> - <FILE id="jlO9LL" name="BilinearUtils.h" compile="0" resource="0" file="Source/Processors/BilinearUtils.h"/> - <FILE id="D6lRuQ" name="BypassProcessor.h" compile="0" resource="0" - file="Source/Processors/BypassProcessor.h"/> - <FILE id="YNkJOh" name="DryWetProcessor.h" compile="0" resource="0" - file="Source/Processors/DryWetProcessor.h"/> - <FILE id="zwLvQ9" name="GainProcessor.h" compile="0" resource="0" file="Source/Processors/GainProcessor.h"/> - <FILE id="SSnw2J" name="IIRFilter.h" compile="0" resource="0" file="Source/Processors/IIRFilter.h"/> - </GROUP> - <FILE id="zPJjtw" name="PluginProcessor.cpp" compile="1" resource="0" - file="Source/PluginProcessor.cpp"/> - <FILE id="JDgaoP" name="PluginProcessor.h" compile="0" resource="0" - file="Source/PluginProcessor.h"/> - </GROUP> - </MAINGROUP> - <EXPORTFORMATS> - <XCODE_MAC targetFolder="Builds/MacOSX"> - <CONFIGURATIONS> - <CONFIGURATION isDebug="1" name="Debug"/> - <CONFIGURATION isDebug="0" name="Release"/> - </CONFIGURATIONS> - <MODULEPATHS> - <MODULEPATH id="juce_audio_basics" path="Juce/modules"/> - <MODULEPATH id="juce_audio_devices" path="Juce/modules"/> - <MODULEPATH id="juce_audio_formats" path="Juce/modules"/> - <MODULEPATH id="juce_audio_plugin_client" path="Juce/modules"/> - <MODULEPATH id="juce_audio_processors" path="Juce/modules"/> - <MODULEPATH id="juce_audio_utils" path="Juce/modules"/> - <MODULEPATH id="juce_core" path="Juce/modules"/> - <MODULEPATH id="juce_data_structures" path="Juce/modules"/> - <MODULEPATH id="juce_events" path="Juce/modules"/> - <MODULEPATH id="juce_graphics" path="Juce/modules"/> - <MODULEPATH id="juce_gui_basics" path="Juce/modules"/> - <MODULEPATH id="juce_gui_extra" path="Juce/modules"/> - <MODULEPATH id="juce_dsp" path="Juce/modules"/> - <MODULEPATH id="foleys_gui_magic" path="."/> - <MODULEPATH id="juce_opengl" path="Juce/modules"/> - </MODULEPATHS> - </XCODE_MAC> - <VS2017 targetFolder="Builds/VisualStudio2017" extraCompilerFlags="/wd4458"> - <CONFIGURATIONS> - <CONFIGURATION isDebug="1" name="Debug"/> - <CONFIGURATION name="Release"/> - <CONFIGURATION isDebug="0" name="Release32" winArchitecture="Win32"/> - </CONFIGURATIONS> - <MODULEPATHS> - <MODULEPATH id="juce_audio_basics" path="Juce/modules"/> - <MODULEPATH id="juce_audio_devices" path="Juce/modules"/> - <MODULEPATH id="juce_audio_formats" path="Juce/modules"/> - <MODULEPATH id="juce_audio_plugin_client" path="Juce/modules"/> - <MODULEPATH id="juce_audio_processors" path="Juce/modules"/> - <MODULEPATH id="juce_audio_utils" path="Juce/modules"/> - <MODULEPATH id="juce_core" path="Juce/modules"/> - <MODULEPATH id="juce_data_structures" path="Juce/modules"/> - <MODULEPATH id="juce_events" path="Juce/modules"/> - <MODULEPATH id="juce_graphics" path="Juce/modules"/> - <MODULEPATH id="juce_gui_basics" path="Juce/modules"/> - <MODULEPATH id="juce_gui_extra" path="Juce/modules"/> - <MODULEPATH id="juce_dsp" path="Juce/modules"/> - <MODULEPATH id="foleys_gui_magic" path="."/> - <MODULEPATH id="juce_opengl" path="Juce/modules"/> - </MODULEPATHS> - </VS2017> - <LINUX_MAKE targetFolder="Builds/LinuxMakefile"> - <CONFIGURATIONS> - <CONFIGURATION isDebug="1" name="Debug"/> - <CONFIGURATION isDebug="0" name="Release"/> - </CONFIGURATIONS> - <MODULEPATHS> - <MODULEPATH id="juce_audio_basics" path="Juce/modules"/> - <MODULEPATH id="juce_audio_devices" path="Juce/modules"/> - <MODULEPATH id="juce_audio_formats" path="Juce/modules"/> - <MODULEPATH id="juce_audio_plugin_client" path="Juce/modules"/> - <MODULEPATH id="juce_audio_processors" path="Juce/modules"/> - <MODULEPATH id="juce_audio_utils" path="Juce/modules"/> - <MODULEPATH id="juce_core" path="Juce/modules"/> - <MODULEPATH id="juce_data_structures" path="Juce/modules"/> - <MODULEPATH id="juce_events" path="Juce/modules"/> - <MODULEPATH id="juce_graphics" path="Juce/modules"/> - <MODULEPATH id="juce_gui_basics" path="Juce/modules"/> - <MODULEPATH id="juce_gui_extra" path="Juce/modules"/> - <MODULEPATH id="juce_dsp" path="Juce/modules"/> - <MODULEPATH id="foleys_gui_magic" path="."/> - <MODULEPATH id="juce_opengl" path="Juce/modules"/> - </MODULEPATHS> - </LINUX_MAKE> - </EXPORTFORMATS> - <MODULES> - <MODULE id="foleys_gui_magic" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - <MODULE id="juce_audio_basics" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - <MODULE id="juce_audio_devices" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - <MODULE id="juce_audio_formats" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - <MODULE id="juce_audio_plugin_client" showAllCode="1" useLocalCopy="0" - useGlobalPath="0"/> - <MODULE id="juce_audio_processors" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - <MODULE id="juce_audio_utils" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - <MODULE id="juce_core" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - <MODULE id="juce_data_structures" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - <MODULE id="juce_dsp" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - <MODULE id="juce_events" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - <MODULE id="juce_graphics" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - <MODULE id="juce_gui_basics" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - <MODULE id="juce_gui_extra" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - <MODULE id="juce_opengl" showAllCode="1" useLocalCopy="0" useGlobalPath="0"/> - </MODULES> - <LIVE_SETTINGS> - <WINDOWS/> - <LINUX/> - <OSX/> - </LIVE_SETTINGS> - <JUCEOPTIONS JUCE_JACK="1" JUCE_VST3_CAN_REPLACE_VST2="0" JUCE_STRICT_REFCOUNTEDPOINTER="1" - FOLEYS_SHOW_GUI_EDITOR_PALLETTE="0" JUCE_WEB_BROWSER="0" FOLEYS_ENABLE_BINARY_DATA="1"/> -</JUCERPROJECT> diff --git a/Plugin/CMakeLists.txt b/Plugin/CMakeLists.txt @@ -0,0 +1,84 @@ +cmake_minimum_required(VERSION 3.15) +set(CMAKE_OSX_DEPLOYMENT_TARGET "10.12" CACHE STRING "Minimum OS X deployment target") +set(CMAKE_CXX_STANDARD 17) +project(CHOWTapeModel VERSION 2.7.0) + +# set up JUCE and modules +add_subdirectory(Juce) +juce_add_modules(foleys_gui_magic) + +add_library(juce_plugin_modules STATIC) +target_link_libraries(juce_plugin_modules + PRIVATE + BinaryData + juce::juce_audio_utils + juce::juce_audio_plugin_client + foleys_gui_magic + PUBLIC + juce::juce_recommended_config_flags + juce::juce_recommended_lto_flags + juce::juce_recommended_warning_flags +) + +target_compile_definitions(juce_plugin_modules + PUBLIC + JUCE_DISPLAY_SPLASH_SCREEN=0 + JUCE_REPORT_APP_USAGE=0 + JUCE_WEB_BROWSER=0 + JUCE_USE_CURL=0 + JUCE_VST3_CAN_REPLACE_VST2=0 + FOLEYS_SHOW_GUI_EDITOR_PALLETTE=0 + FOLEYS_ENABLE_BINARY_DATA=1 + JucePlugin_Manufacturer="chowdsp" + JucePlugin_VersionString="${CMAKE_PROJECT_VERSION}" + JucePlugin_Name="${CMAKE_PROJECT_NAME}" + INTERFACE + $<TARGET_PROPERTY:juce_plugin_modules,COMPILE_DEFINITIONS> +) + +if(MSVC) + target_compile_options(juce_plugin_modules PRIVATE /wd4458) # supress "declaration hides class member" for Foley's +endif() + +target_include_directories(juce_plugin_modules + INTERFACE + $<TARGET_PROPERTY:juce_plugin_modules,INCLUDE_DIRECTORIES> +) + +set_target_properties(juce_plugin_modules PROPERTIES + POSITION_INDEPENDENT_CODE TRUE + VISIBILITY_INLINES_HIDDEN TRUE + C_VISBILITY_PRESET hidden + CXX_VISIBILITY_PRESET hidden +) + +# set up plugin project +# juce_set_vst2_sdk_path(C:/SDKs/VST_SDK/VST2_SDK/) +# include_directories(C:/SDKs/asiosdk2.3/common) + +juce_add_plugin(CHOWTapeModel + COMPANY_NAME chowdsp + PLUGIN_MANUFACTURER_CODE Chow + PLUGIN_CODE Jdox + FORMATS AU VST3 Standalone LV2 #VST + ProductName "CHOWTapeModel" + LV2_URI https://github.com/jatinchowdhury18/AnalogTapeModel +) + +# create JUCE header +juce_generate_juce_header(CHOWTapeModel) + +add_subdirectory(Source) + +target_compile_definitions(CHOWTapeModel + PUBLIC + JUCE_DISPLAY_SPLASH_SCREEN=0 + JUCE_REPORT_APP_USAGE=0 + JUCE_WEB_BROWSER=0 + JUCE_USE_CURL=0 + JUCE_VST3_CAN_REPLACE_VST2=0 +) + +target_link_libraries(CHOWTapeModel PUBLIC + juce_plugin_modules +) diff --git a/Plugin/Screenshots/full_gui.png b/Plugin/Screenshots/full_gui.png Binary files differ. diff --git a/Plugin/Source/CMakeLists.txt b/Plugin/Source/CMakeLists.txt @@ -0,0 +1,59 @@ +add_subdirectory(GUI) +add_subdirectory(Processors) + +target_sources(CHOWTapeModel PRIVATE + PluginProcessor.cpp + + MixGroups/MixGroupsController.cpp + MixGroups/MixGroupsSharedData.cpp + + Presets/PresetComp.cpp + Presets/PresetManager.cpp +) + +juce_add_binary_data(BinaryData SOURCES + GUI/Assets/Background.svg + GUI/Assets/gui.xml + GUI/Assets/knob.svg + GUI/Assets/pointer.svg + GUI/Assets/powerswitch.svg + GUI/Assets/RobotoCondensed-Bold.ttf + GUI/Assets/RobotoCondensed-Regular.ttf + + Presets/PresetConfigs/Default.chowpreset + Presets/PresetConfigs/LoFi.chowpreset + Presets/PresetConfigs/OldTape.chowpreset + Presets/PresetConfigs/SNK_BassPusher.chowpreset + Presets/PresetConfigs/SNK_Chorus2.chowpreset + Presets/PresetConfigs/SNK_Chorus3.chowpreset + Presets/PresetConfigs/SNK_Chorus4.chowpreset + Presets/PresetConfigs/SNK_CleanFat.chowpreset + Presets/PresetConfigs/SNK_Fat2.chowpreset + Presets/PresetConfigs/SNK_Gritty.chowpreset + Presets/PresetConfigs/SNK_Gritty2.chowpreset + Presets/PresetConfigs/SNK_lofi.chowpreset + Presets/PresetConfigs/SNK_SlightlyWobbly.chowpreset + Presets/PresetConfigs/TC260.chowpreset + Presets/PresetConfigs/Underbiased.chowpreset + Presets/PresetConfigs/WoozyChorus.chowpreset + + Processors/Hysteresis/STN_Models/hyst_width_0.json + Processors/Hysteresis/STN_Models/hyst_width_10.json + Processors/Hysteresis/STN_Models/hyst_width_20.json + Processors/Hysteresis/STN_Models/hyst_width_30.json + Processors/Hysteresis/STN_Models/hyst_width_40.json + Processors/Hysteresis/STN_Models/hyst_width_50.json + Processors/Hysteresis/STN_Models/hyst_width_60.json + Processors/Hysteresis/STN_Models/hyst_width_70.json + Processors/Hysteresis/STN_Models/hyst_width_80.json + Processors/Hysteresis/STN_Models/hyst_width_90.json + Processors/Hysteresis/STN_Models/hyst_width_100.json +) + +# Need to build BinaryData with -fPIC flag on Linux +set_target_properties(BinaryData PROPERTIES + POSITION_INDEPENDENT_CODE TRUE) + +if(${BUILD_HEADLESS}) + add_subdirectory(Headless) +endif() diff --git a/Plugin/Source/GUI/AutoUpdating.cpp b/Plugin/Source/GUI/AutoUpdating.cpp @@ -2,18 +2,17 @@ namespace { - const String updateFilePath = "ChowdhuryDSP/ChowTape/UpdateManage.txt"; - const String currentVersion = "v" + String (JucePlugin_VersionString); - const String versionURL = "https://api.github.com/repos/jatinchowdhury18/AnalogTapeModel/releases/latest"; - const String updateURL = "https://github.com/jatinchowdhury18/AnalogTapeModel/releases/latest"; - const Colour backgroundColour = Colour (0xFF31323A).withAlpha (0.9f); - const Colour textColour = Colour (0xFFEAA92C); -} +const String updateFilePath = "ChowdhuryDSP/ChowTape/UpdateManage.txt"; +const String currentVersion = "v" + String (JucePlugin_VersionString); +const String versionURL = "https://api.github.com/repos/jatinchowdhury18/AnalogTapeModel/releases/latest"; +const String updateURL = "https://github.com/jatinchowdhury18/AnalogTapeModel/releases/latest"; +const Colour backgroundColour = Colour (0xFF31323A).withAlpha (0.9f); +const Colour textColour = Colour (0xFFEAA92C); +} // namespace AutoUpdater::AutoUpdater() { - auto setupButton = [=] (TextButton& button) - { + auto setupButton = [=] (TextButton& button) { addAndMakeVisible (button); button.setColour (TextButton::buttonColourId, backgroundColour); button.setColour (TextButton::textColourOffId, textColour); @@ -109,7 +108,7 @@ bool AutoUpdater::runAutoUpdateCheck() String updateVersion = getUpdateFileVersion (updateFile); bool lastYesNo = getUpdateFileYesNo (updateFile); - + // you've already said you don't want to update to this version if ((updateVersion == latestVersion) && (lastYesNo == false)) return false; diff --git a/Plugin/Source/GUI/AutoUpdating.h b/Plugin/Source/GUI/AutoUpdating.h @@ -1,9 +1,9 @@ #ifndef AUTOUPDATING_H_INCLUDED #define AUTOUPDATING_H_INCLUDED +#include "MyLNF.h" #include <JuceHeader.h> #include <future> -#include "MyLNF.h" struct UpdateButtonLNF : public MyLNF { diff --git a/Plugin/Source/GUI/CMakeLists.txt b/Plugin/Source/GUI/CMakeLists.txt @@ -0,0 +1,12 @@ +target_sources(CHOWTapeModel PRIVATE + AutoUpdating.cpp + InfoComp.cpp + LightMeter.cpp + MixGroupViz.cpp + MyLNF.cpp + OnOffManager.cpp + PowerButton.cpp + TapeScope.cpp + TitleComp.cpp + TooltipComp.cpp +) diff --git a/Plugin/Source/GUI/InfoComp.cpp b/Plugin/Source/GUI/InfoComp.cpp @@ -1,7 +1,6 @@ #include "InfoComp.h" -InfoComp::InfoComp (const AudioProcessor::WrapperType wrapperType) : - wrapperType (wrapperType) +InfoComp::InfoComp (const AudioProcessor::WrapperType wrapperType) : wrapperType (wrapperType) { setColour (text1ColourID, Colours::grey); setColour (text2ColourID, Colours::white); @@ -16,10 +15,9 @@ void InfoComp::paint (Graphics& g) auto font = g.getCurrentFont(); auto b = getLocalBounds(); - auto drawText = [=, &g, &b] (const String& text) - { + auto drawText = [=, &g, &b] (const String& text) { auto width = font.getStringWidth (text); - g.drawFittedText (text, b.removeFromLeft (width), Justification::left, 1); + g.drawFittedText (text, b.removeFromLeft (width), Justification::left, 1); }; auto typeStr = String (AudioProcessor::getWrapperTypeDescription (wrapperType)); @@ -32,7 +30,7 @@ void InfoComp::paint (Graphics& g) g.setColour (findColour (text1ColourID)); drawText (String ("~ DSP by ")); - linkX = b.getX() - 2; + linkX = b.getX() - 2; linkButton.setColour (HyperlinkButton::ColourIds::textColourId, findColour (text2ColourID)); resized(); } diff --git a/Plugin/Source/GUI/InfoComp.h b/Plugin/Source/GUI/InfoComp.h @@ -20,10 +20,10 @@ public: private: const AudioProcessor::WrapperType wrapperType; HyperlinkButton linkButton { JucePlugin_Manufacturer, URL ("https://ccrma.stanford.edu/~jatin/chowdsp") }; - + int linkX = 0; - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(InfoComp) + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (InfoComp) }; class InfoItem : public foleys::GuiItem @@ -31,12 +31,11 @@ class InfoItem : public foleys::GuiItem public: FOLEYS_DECLARE_GUI_FACTORY (InfoItem) - InfoItem (foleys::MagicGUIBuilder& builder, const ValueTree& node) : - foleys::GuiItem (builder, node) + InfoItem (foleys::MagicGUIBuilder& builder, const ValueTree& node) : foleys::GuiItem (builder, node) { setColourTranslation ({ - {"text1", InfoComp::text1ColourID}, - {"text2", InfoComp::text2ColourID}, + { "text1", InfoComp::text1ColourID }, + { "text2", InfoComp::text2ColourID }, }); infoComp = std::make_unique<InfoComp> (builder.getMagicState().getProcessor()->wrapperType); @@ -55,7 +54,7 @@ public: private: std::unique_ptr<InfoComp> infoComp; - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(InfoItem) + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (InfoItem) }; #endif // INFOCOMP_H_INCLUDED diff --git a/Plugin/Source/GUI/LightMeter.cpp b/Plugin/Source/GUI/LightMeter.cpp @@ -3,7 +3,7 @@ void LightMeter::pushSamples (const juce::AudioBuffer<float>& buffer) { rms = buffer.getRMSLevel (0, 0, buffer.getNumSamples()); - + if (std::isnan (rms.load())) rms = 0.0f; diff --git a/Plugin/Source/GUI/MixGroupViz.cpp b/Plugin/Source/GUI/MixGroupViz.cpp @@ -1,7 +1,6 @@ #include "MixGroupViz.h" -MixGroupViz::MixGroupViz (AudioProcessorParameter* mixGroupParam) : - mixGroupParam (mixGroupParam) +MixGroupViz::MixGroupViz (AudioProcessorParameter* mixGroupParam) : mixGroupParam (mixGroupParam) { mixGroupParam->addListener (this); setMixGroupColour (int (mixGroupParam->getValue() * MixGroupsConstants::numMixGroups)); @@ -21,28 +20,28 @@ void MixGroupViz::setMixGroupColour (int mixGroupIdx) { switch (mixGroupIdx) { - case 0: - circleColour = Colour (0x00000000); // no circle - break; + case 0: + circleColour = Colour (0x00000000); // no circle + break; - case 1: - circleColour = Colour (0xFF8B3232); // red - break; + case 1: + circleColour = Colour (0xFF8B3232); // red + break; - case 2: - circleColour = Colour (0xFFEAA92C); // orange - break; + case 2: + circleColour = Colour (0xFFEAA92C); // orange + break; - case 3: - circleColour = Colour (0xFF9CBCBD); // grey/blue - break; + case 3: + circleColour = Colour (0xFF9CBCBD); // grey/blue + break; - case 4: - circleColour = Colour (0xFFBDB09C); // beige - break; + case 4: + circleColour = Colour (0xFFBDB09C); // beige + break; - default: - circleColour = Colour (0x00000000); + default: + circleColour = Colour (0x00000000); }; MessageManagerLock mml; @@ -54,7 +53,7 @@ void MixGroupViz::paint (Graphics& g) const auto height = float (getHeight() - getPosition().getY()); const auto centre = Point<int> (getWidth() / 2, getHeight() / 2).toFloat(); auto bounds = Rectangle<float> (height, height) - .withCentre (centre); + .withCentre (centre); g.setColour (circleColour); g.fillEllipse (bounds); diff --git a/Plugin/Source/GUI/MixGroupViz.h b/Plugin/Source/GUI/MixGroupViz.h @@ -1,8 +1,8 @@ #ifndef MIXGROUPVIZ_H_INCLUDED #define MIXGROUPVIZ_H_INCLUDED -#include <JuceHeader.h> #include "../MixGroups/MixGroupsController.h" +#include <JuceHeader.h> class MixGroupViz : public Component, private AudioProcessorParameter::Listener @@ -28,9 +28,8 @@ class MixGroupVizItem : public foleys::GuiItem public: FOLEYS_DECLARE_GUI_FACTORY (MixGroupVizItem) - MixGroupVizItem (foleys::MagicGUIBuilder& builder, const ValueTree& node) : - foleys::GuiItem (builder, node), - viz (builder.getMagicState().getParameter (MixGroupsConstants::mixGroupParamID)) + MixGroupVizItem (foleys::MagicGUIBuilder& builder, const ValueTree& node) : foleys::GuiItem (builder, node), + viz (builder.getMagicState().getParameter (MixGroupsConstants::mixGroupParamID)) { addAndMakeVisible (viz); } @@ -45,4 +44,3 @@ private: }; #endif // !MIXGROUPVIZ_H_INCLUDED - diff --git a/Plugin/Source/GUI/MyLNF.cpp b/Plugin/Source/GUI/MyLNF.cpp @@ -16,24 +16,24 @@ Typeface::Ptr MyLNF::getTypefaceForFont (const Font& font) return font.isBold() ? robotoBold : roboto; } -void MyLNF::drawRotarySlider (juce::Graphics& g, int x, int y, int width, int height, - float sliderPos, float rotaryStartAngle, - float rotaryEndAngle, juce::Slider& s) +void MyLNF::drawRotarySlider (juce::Graphics& g, int x, int y, int width, int height, float sliderPos, float rotaryStartAngle, float rotaryEndAngle, juce::Slider& s) { - int diameter = (width > height)? height : width; - if (diameter < 16) return; + int diameter = (width > height) ? height : width; + if (diameter < 16) + return; juce::Point<float> centre (x + std::floor (width * 0.5f + 0.5f), y + std::floor (height * 0.5f + 0.5f)); - diameter -= (diameter % 2)? 9 : 8; + diameter -= (diameter % 2) ? 9 : 8; float radius = diameter * 0.5f; x = int (centre.x - radius); y = int (centre.y - radius); - const auto bounds = juce::Rectangle<int> (x, y, diameter, diameter).toFloat(); + const auto bounds = juce::Rectangle<int> (x, y, diameter, diameter).toFloat(); auto b = pointer->getBounds().toFloat(); pointer->setTransform (AffineTransform::rotation (MathConstants<float>::twoPi * ((sliderPos - 0.5f) * 300.0f / 360.0f), - b.getCentreX(), b.getCentreY())); + b.getCentreX(), + b.getCentreY())); const auto alpha = s.isEnabled() ? 1.0f : 0.4f; @@ -55,18 +55,12 @@ void MyLNF::drawRotarySlider (juce::Graphics& g, int x, int y, int width, int he g.fillPath (valueArc); } -void MyLNF::drawToggleButton (Graphics& g, ToggleButton& button, - bool shouldDrawButtonAsHighlighted, bool shouldDrawButtonAsDown) +void MyLNF::drawToggleButton (Graphics& g, ToggleButton& button, bool shouldDrawButtonAsHighlighted, bool shouldDrawButtonAsDown) { auto fontSize = jmin (15.0f, (float) button.getHeight() * 0.75f); auto tickWidth = fontSize * 1.1f; - drawTickBox (g, button, 4.0f, ((float) button.getHeight() - tickWidth) * 0.5f, - tickWidth, tickWidth, - button.getToggleState(), - button.isEnabled(), - shouldDrawButtonAsHighlighted, - shouldDrawButtonAsDown); + drawTickBox (g, button, 4.0f, ((float) button.getHeight() - tickWidth) * 0.5f, tickWidth, tickWidth, button.getToggleState(), button.isEnabled(), shouldDrawButtonAsHighlighted, shouldDrawButtonAsDown); g.setColour (button.findColour (ToggleButton::textColourId)); g.setFont (Font (fontSize).boldened()); @@ -75,13 +69,12 @@ void MyLNF::drawToggleButton (Graphics& g, ToggleButton& button, g.setOpacity (0.5f); g.drawFittedText (button.getButtonText(), - button.getLocalBounds().withTrimmedLeft (roundToInt (tickWidth) + 10) - .withTrimmedRight (2), - Justification::centredLeft, 10); + button.getLocalBounds().withTrimmedLeft (roundToInt (tickWidth) + 10).withTrimmedRight (2), + Justification::centredLeft, + 10); } -void MyLNF::createTabTextLayout (const TabBarButton& button, float length, float depth, - Colour colour, TextLayout& textLayout) +void MyLNF::createTabTextLayout (const TabBarButton& button, float length, float depth, Colour colour, TextLayout& textLayout) { Font font (depth * 0.45f, Font::bold); font.setUnderline (button.hasKeyboardFocus (false)); @@ -111,15 +104,28 @@ void MyLNF::drawTabButton (TabBarButton& button, Graphics& g, bool /*isMouseOver switch (o) { - case TabbedButtonBar::TabsAtBottom: p1 = activeArea.getBottomLeft(); p2 = activeArea.getTopLeft(); break; - case TabbedButtonBar::TabsAtTop: p1 = activeArea.getTopLeft(); p2 = activeArea.getBottomLeft(); break; - case TabbedButtonBar::TabsAtRight: p1 = activeArea.getTopRight(); p2 = activeArea.getTopLeft(); break; - case TabbedButtonBar::TabsAtLeft: p1 = activeArea.getTopLeft(); p2 = activeArea.getTopRight(); break; - default: jassertfalse; break; + case TabbedButtonBar::TabsAtBottom: + p1 = activeArea.getBottomLeft(); + p2 = activeArea.getTopLeft(); + break; + case TabbedButtonBar::TabsAtTop: + p1 = activeArea.getTopLeft(); + p2 = activeArea.getBottomLeft(); + break; + case TabbedButtonBar::TabsAtRight: + p1 = activeArea.getTopRight(); + p2 = activeArea.getTopLeft(); + break; + case TabbedButtonBar::TabsAtLeft: + p1 = activeArea.getTopLeft(); + p2 = activeArea.getTopRight(); + break; + default: + jassertfalse; + break; } - g.setGradientFill (ColourGradient (bkg.brighter (0.2f), p1.toFloat(), - bkg.darker (0.1f), p2.toFloat(), false)); + g.setGradientFill (ColourGradient (bkg.brighter (0.2f), p1.toFloat(), bkg.darker (0.1f), p2.toFloat(), false)); } g.fillRect (activeArea); @@ -138,7 +144,7 @@ void MyLNF::drawTabButton (TabBarButton& button, Graphics& g, bool /*isMouseOver const Rectangle<float> area (button.getTextArea().toFloat()); float length = area.getWidth(); - float depth = area.getHeight(); + float depth = area.getHeight(); if (button.getTabbedButtonBar().isVertical()) std::swap (length, depth); @@ -150,28 +156,34 @@ void MyLNF::drawTabButton (TabBarButton& button, Graphics& g, bool /*isMouseOver switch (o) { - case TabbedButtonBar::TabsAtLeft: t = t.rotated (MathConstants<float>::pi * -0.5f).translated (area.getX(), area.getBottom()); break; - case TabbedButtonBar::TabsAtRight: t = t.rotated (MathConstants<float>::pi * 0.5f).translated (area.getRight(), area.getY()); break; - case TabbedButtonBar::TabsAtTop: - case TabbedButtonBar::TabsAtBottom: t = t.translated (area.getX(), area.getY()); break; - default: jassertfalse; break; + case TabbedButtonBar::TabsAtLeft: + t = t.rotated (MathConstants<float>::pi * -0.5f).translated (area.getX(), area.getBottom()); + break; + case TabbedButtonBar::TabsAtRight: + t = t.rotated (MathConstants<float>::pi * 0.5f).translated (area.getRight(), area.getY()); + break; + case TabbedButtonBar::TabsAtTop: + case TabbedButtonBar::TabsAtBottom: + t = t.translated (area.getX(), area.getY()); + break; + default: + jassertfalse; + break; } g.addTransform (t); textLayout.draw (g, Rectangle<float> (length, depth)); } -void MyLNF::drawLinearSlider (Graphics& g, int x, int y, int width, int height, - float sliderPos, float /*minSliderPos*/, float /*maxSliderPos*/, - const Slider::SliderStyle, Slider& slider) +void MyLNF::drawLinearSlider (Graphics& g, int x, int y, int width, int height, float sliderPos, float /*minSliderPos*/, float /*maxSliderPos*/, const Slider::SliderStyle, Slider& slider) { auto trackWidth = jmin (6.0f, slider.isHorizontal() ? (float) height * 0.25f : (float) width * 0.25f); Point<float> startPoint (slider.isHorizontal() ? (float) x : (float) x + (float) width * 0.5f, - slider.isHorizontal() ? (float) y + (float) height * 0.5f : (float) (height + y)); + slider.isHorizontal() ? (float) y + (float) height * 0.5f : (float) (height + y)); Point<float> endPoint (slider.isHorizontal() ? (float) (width + x) : startPoint.x, - slider.isHorizontal() ? startPoint.y : (float) y); + slider.isHorizontal() ? startPoint.y : (float) y); const auto alpha = slider.isEnabled() ? 1.0f : 0.4f; @@ -200,7 +212,8 @@ void MyLNF::drawLinearSlider (Graphics& g, int x, int y, int width, int height, g.strokePath (valueTrack, { trackWidth, PathStrokeType::curved, PathStrokeType::rounded }); auto thumbRect = Rectangle<float> (static_cast<float> (thumbWidth), - static_cast<float> (thumbWidth)).withCentre (maxPoint); + static_cast<float> (thumbWidth)) + .withCentre (maxPoint); knob->drawWithin (g, thumbRect, RectanglePlacement::stretchToFit, alpha); } diff --git a/Plugin/Source/GUI/MyLNF.h b/Plugin/Source/GUI/MyLNF.h @@ -8,22 +8,16 @@ class MyLNF : public LookAndFeel_V4 public: MyLNF(); - Typeface::Ptr getTypefaceForFont(const Font&) override; + Typeface::Ptr getTypefaceForFont (const Font&) override; - void drawRotarySlider (juce::Graphics& g, int x, int y, int width, int height, - float sliderPos, float rotaryStartAngle, - float rotaryEndAngle, juce::Slider& slider) override; + void drawRotarySlider (juce::Graphics& g, int x, int y, int width, int height, float sliderPos, float rotaryStartAngle, float rotaryEndAngle, juce::Slider& slider) override; - void drawToggleButton (Graphics& g, ToggleButton& button, - bool shouldDrawButtonAsHighlighted, bool shouldDrawButtonAsDown) override; + void drawToggleButton (Graphics& g, ToggleButton& button, bool shouldDrawButtonAsHighlighted, bool shouldDrawButtonAsDown) override; - void createTabTextLayout (const TabBarButton& button, float length, float depth, - Colour colour, TextLayout& textLayout); + void createTabTextLayout (const TabBarButton& button, float length, float depth, Colour colour, TextLayout& textLayout); void drawTabButton (TabBarButton& button, Graphics& g, bool isMouseOver, bool isMouseDown) override; - void drawLinearSlider (Graphics& g, int x, int y, int width, int height, - float sliderPos, float minSliderPos, float maxSliderPos, - const Slider::SliderStyle style, Slider& slider) override; + void drawLinearSlider (Graphics& g, int x, int y, int width, int height, float sliderPos, float minSliderPos, float maxSliderPos, const Slider::SliderStyle style, Slider& slider) override; Slider::SliderLayout getSliderLayout (Slider& slider) override; Label* createSliderTextBox (Slider& slider) override; @@ -38,7 +32,6 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (MyLNF) }; - class ComboBoxLNF : public MyLNF { public: @@ -52,16 +45,9 @@ public: void drawComboBox (Graphics& g, int width, int height, bool, int, int, int, int, ComboBox& box) override; void positionComboBoxText (ComboBox& box, Label& label) override; - void drawPopupMenuItem (Graphics& g, const Rectangle<int>& area, - const bool isSeparator, const bool isActive, - const bool isHighlighted, const bool /*isTicked*/, - const bool hasSubMenu, const String& text, - const String& shortcutKeyText, - const Drawable* icon, const Colour* const textColourToUse) override + void drawPopupMenuItem (Graphics& g, const Rectangle<int>& area, const bool isSeparator, const bool isActive, const bool isHighlighted, const bool /*isTicked*/, const bool hasSubMenu, const String& text, const String& shortcutKeyText, const Drawable* icon, const Colour* const textColourToUse) override { - LookAndFeel_V4::drawPopupMenuItem (g, area, isSeparator, isActive, - isHighlighted, false /*isTicked*/, hasSubMenu, text, - shortcutKeyText, icon, textColourToUse); + LookAndFeel_V4::drawPopupMenuItem (g, area, isSeparator, isActive, isHighlighted, false /*isTicked*/, hasSubMenu, text, shortcutKeyText, icon, textColourToUse); } void drawPopupMenuBackground (Graphics& g, int width, int height) override @@ -74,7 +60,6 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ComboBoxLNF) }; - class PresetsLNF : public ComboBoxLNF { public: @@ -100,21 +85,18 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (PresetsLNF) }; - class SpeedButtonLNF : public MyLNF { public: SpeedButtonLNF() {} - void drawButtonBackground (Graphics& g, Button& button, - const Colour& backgroundColour, bool shouldDrawButtonAsHighlighted, - bool shouldDrawButtonAsDown) override + void drawButtonBackground (Graphics& g, Button& button, const Colour& backgroundColour, bool shouldDrawButtonAsHighlighted, bool shouldDrawButtonAsDown) override { constexpr auto cornerSize = 8.0f; auto bounds = button.getLocalBounds().toFloat().reduced (0.5f, 0.5f); auto baseColour = backgroundColour.withMultipliedSaturation (button.hasKeyboardFocus (true) ? 1.3f : 0.9f) - .withMultipliedAlpha (button.isEnabled() ? 1.0f : 0.5f); + .withMultipliedAlpha (button.isEnabled() ? 1.0f : 0.5f); if (shouldDrawButtonAsDown || shouldDrawButtonAsHighlighted) baseColour = baseColour.contrasting (shouldDrawButtonAsDown ? 0.2f : 0.05f); @@ -130,5 +112,4 @@ private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (SpeedButtonLNF) }; - #endif // MYLNF_H_INCLUDED diff --git a/Plugin/Source/GUI/OnOffManager.cpp b/Plugin/Source/GUI/OnOffManager.cpp @@ -1,42 +1,41 @@ -#include <unordered_map> #include "OnOffManager.h" +#include <unordered_map> namespace { - static const std::unordered_map<String, StringArray> triggerMap { - { String ("ifilt_onoff"), StringArray ({ "Low Cut", "High Cut", "Makeup" }) }, - { String ("hyst_onoff"), StringArray ({ "Bias", "Saturation", "Drive" }) }, - { String ("tone_onoff"), StringArray ({ "Bass", "Treble", "Transition Frequency" }) }, - { String ("loss_onoff"), StringArray ({ "Gap", "Thickness", "Spacing", "Speed", "3.75 ips", "7.5 ips", "15 ips", "30 ips" }) }, - { String ("chew_onoff"), StringArray ({ "Chew Depth", "Chew Frequency", "Chew Variance" }) }, - { String ("deg_onoff"), StringArray ({ "Depth", "Amount", "Variance" }) }, - { String ("flutter_onoff"), StringArray ({ "Flutter Depth", "Flutter Rate", "Wow Depth", "Wow Rate" }) }, - }; +static const std::unordered_map<String, StringArray> triggerMap { + { String ("ifilt_onoff"), StringArray ({ "Low Cut", "High Cut", "Makeup" }) }, + { String ("hyst_onoff"), StringArray ({ "Bias", "Saturation", "Drive" }) }, + { String ("tone_onoff"), StringArray ({ "Bass", "Treble", "Transition Frequency" }) }, + { String ("loss_onoff"), StringArray ({ "Gap", "Thickness", "Spacing", "Speed", "3.75 ips", "7.5 ips", "15 ips", "30 ips" }) }, + { String ("chew_onoff"), StringArray ({ "Chew Depth", "Chew Frequency", "Chew Variance" }) }, + { String ("deg_onoff"), StringArray ({ "Depth", "Amount", "Variance" }) }, + { String ("flutter_onoff"), StringArray ({ "Flutter Depth", "Flutter Rate", "Wow Depth", "Wow Rate" }) }, +}; - void toggleEnableDisable (Component* root, StringArray& compNames, bool shouldBeEnabled) - { - if (root == nullptr || compNames.isEmpty()) - return; +void toggleEnableDisable (Component* root, StringArray& compNames, bool shouldBeEnabled) +{ + if (root == nullptr || compNames.isEmpty()) + return; - for (auto child : root->getChildren()) + for (auto child : root->getChildren()) + { + auto compName = child->getName(); + if (compNames.contains (compName)) { - auto compName = child->getName(); - if (compNames.contains (compName)) - { - MessageManagerLock mml; - compNames.removeString (compName); - child->setEnabled (shouldBeEnabled); - continue; - } - - toggleEnableDisable (child, compNames, shouldBeEnabled); + MessageManagerLock mml; + compNames.removeString (compName); + child->setEnabled (shouldBeEnabled); + continue; } + + toggleEnableDisable (child, compNames, shouldBeEnabled); } } +} // namespace -OnOffManager::OnOffManager (AudioProcessorValueTreeState& vts, const AudioProcessor* proc) : - vts (vts), - proc (proc) +OnOffManager::OnOffManager (AudioProcessorValueTreeState& vts, const AudioProcessor* proc) : vts (vts), + proc (proc) { for (auto& trigger : triggerMap) vts.addParameterListener (trigger.first, this); @@ -58,7 +57,7 @@ void OnOffManager::setOnOffForNewEditor (AudioProcessorEditor* editor) } } -void OnOffManager::parameterChanged (const String ¶mID, float newValue) +void OnOffManager::parameterChanged (const String& paramID, float newValue) { if (triggerMap.find (paramID) == triggerMap.end()) // unknown trigger key return; diff --git a/Plugin/Source/GUI/OnOffManager.h b/Plugin/Source/GUI/OnOffManager.h @@ -11,7 +11,7 @@ public: ~OnOffManager(); void setOnOffForNewEditor (AudioProcessorEditor* editor); - void parameterChanged (const String ¶meterID, float newValue) override; + void parameterChanged (const String& parameterID, float newValue) override; private: AudioProcessorValueTreeState& vts; diff --git a/Plugin/Source/GUI/PowerButton.cpp b/Plugin/Source/GUI/PowerButton.cpp @@ -1,7 +1,6 @@ #include "PowerButton.h" -PowerButton::PowerButton() : - button ("", DrawableButton::ImageStretched) +PowerButton::PowerButton() : button ("", DrawableButton::ImageStretched) { setColour (buttonColourId, Colours::blue); setColour (buttonOnColourId, Colours::red); @@ -18,32 +17,26 @@ void PowerButton::resized() auto dim = (int) ((float) jmin (getWidth(), getHeight()) * 0.6f); auto centre = getLocalBounds().getCentre(); auto topLeft = centre.translated (-dim / 2, -dim / 2); - + button.setBounds (topLeft.x, topLeft.y, dim, dim); } void PowerButton::updateColours() { - std::unique_ptr<Drawable> onImage (Drawable::createFromImageData - (BinaryData::powerswitch_svg, BinaryData::powerswitch_svgSize)); + std::unique_ptr<Drawable> onImage (Drawable::createFromImageData (BinaryData::powerswitch_svg, BinaryData::powerswitch_svgSize)); auto offImage = onImage->createCopy(); onImage->replaceColour (Colours::black, findColour (buttonOnColourId)); offImage->replaceColour (Colours::black, findColour (buttonColourId)); - button.setImages (offImage.get(), offImage.get(), onImage.get(), - offImage.get(), onImage.get(), onImage.get(), offImage.get()); + button.setImages (offImage.get(), offImage.get(), onImage.get(), offImage.get(), onImage.get(), onImage.get(), offImage.get()); } //=============================================================== -PowerButtonItem::PowerButtonItem (foleys::MagicGUIBuilder& builder, const juce::ValueTree& node) : - foleys::GuiItem (builder, node) +PowerButtonItem::PowerButtonItem (foleys::MagicGUIBuilder& builder, const juce::ValueTree& node) : foleys::GuiItem (builder, node) { setColourTranslation ( - { - { "button-color", PowerButton::buttonColourId }, - { "button-on-color", PowerButton::buttonOnColourId } - } - ); + { { "button-color", PowerButton::buttonColourId }, + { "button-on-color", PowerButton::buttonOnColourId } }); addAndMakeVisible (button); } diff --git a/Plugin/Source/GUI/ScreenshotHelper.cpp b/Plugin/Source/GUI/ScreenshotHelper.cpp @@ -1,114 +0,0 @@ -#include "ScreenshotHelper.h" - -#ifdef TAKE_SCREENSHOTS - -namespace ScreenshotHelper -{ - -/** - * Process audio through the plugin so the screenshots have - * some signal show up in the meters and scopes. - */ -void processAudio (ChowtapeModelAudioProcessor* plugin) -{ - constexpr double fs = 48000.0; - constexpr int blockSize = 1024; - constexpr float freq = 200.0f; - - AudioBuffer<float> buffer (2, blockSize); - for (int ch = 0; ch < 2; ++ch) - { - auto* data = buffer.getWritePointer (ch); - for (int n = 0; n < blockSize; ++n) - data[n] = -0.7f * std::cos (MathConstants<float>::twoPi * freq * (float) n / (float) fs); - } - - plugin->prepareToPlay (fs, blockSize); - - MidiBuffer midi; - plugin->processBlock (buffer, midi); -} - -void findTabbedComponents (Component* root, Array<foleys::Container*>& tabbedComps) -{ - if (root == nullptr) - return; - - for (auto child : root->getChildren()) - { - if (auto tabbedComponent = dynamic_cast<foleys::Container*> (child)) - { - if (tabbedComponent->layout == foleys::Container::Layout::Tabbed) - tabbedComps.add (tabbedComponent); - } - - findTabbedComponents (child, tabbedComps); - } -} - -void screenshotTab (foleys::Container* container, int tabIdx) -{ - container->tabbedButtons->setCurrentTabIndex (tabIdx); - auto name = container->tabbedButtons->getTabButton (tabIdx)->getName(); - - int index = 0; - for (auto& child : container->children) - child->setVisible (tabIdx == index++); - - screenshotForBounds (container, container->getLocalBounds(), name + ".png"); -} - -void takeScreenshots (std::unique_ptr<ChowtapeModelAudioProcessor> plugin) -{ - processAudio (plugin.get()); - std::unique_ptr<AudioProcessorEditor> editor (plugin->createEditorIfNeeded()); - - // make sure all plugin sections are enabled - StringArray onOffIDs { "ifilt_onoff", "hyst_onoff", "tone_onoff", "loss_onoff", "chew_onoff", "deg_onoff", "flutter_onoff" }; - for (auto param : plugin->getParameters()) - { - if (auto* paramCast = dynamic_cast<RangedAudioParameter*> (param)) - { - if (onOffIDs.contains (paramCast->paramID)) - paramCast->setValueNotifyingHost (1.0f); - } - } - - // full screenshot - screenshotForBounds (editor.get(), editor->getLocalBounds(), "full_gui.png"); - - // get tabbed components - Array<foleys::Container*> tabbedComps; - findTabbedComponents (editor.get(), tabbedComps); - - for (auto c : tabbedComps) - for (int i = 0; i < c->tabbedButtons->getNumTabs(); ++i) - screenshotTab (c, i); - - plugin->editorBeingDeleted (editor.get()); -} - -File getScreenshotFolder() -{ - return File ("D:/Documents/CCRMA/Music 420/AnalogTapeModel/Plugin/Screenshots"); -} - -void screenshotForBounds (Component* editor, Rectangle<int> bounds, const String& filename) -{ - auto screenshot = editor->createComponentSnapshot (bounds); - - File pngFile = getScreenshotFolder().getChildFile (filename); - pngFile.deleteFile(); - pngFile.create(); - auto pngStream = pngFile.createOutputStream(); - - if (pngStream->openedOk()) - { - PNGImageFormat pngImage; - pngImage.writeImageToStream (screenshot, *pngStream.get()); - } -} - -} // ScreenshotHelper - -#endif // TAKE_SCREENSHOTS diff --git a/Plugin/Source/GUI/ScreenshotHelper.h b/Plugin/Source/GUI/ScreenshotHelper.h @@ -1,27 +0,0 @@ -#ifndef SCREENSHOTHELPER_H_INCLUDED -#define SCREENSHOTHELPER_H_INCLUDED - -// #define TAKE_SCREENSHOTS - -#ifdef TAKE_SCREENSHOTS - -// weird hack, but I need acces to some private -// member variables from foleys::Container -#define _XKEYCHECK_H -#define private public -#include "../PluginProcessor.h" -#undef private - -namespace ScreenshotHelper -{ - /** Take a series of screenshots used for the plugin documentation */ - void takeScreenshots (std::unique_ptr<ChowtapeModelAudioProcessor> plugin); - - /** Take a single screenshot for a given rectangle */ - void screenshotForBounds (Component* editor, Rectangle<int> bounds, const String& filename); - -} // ScreenshotHelper - -#endif // TAKE_SCREENSHOTS - -#endif // SCREENSHOTHELPER_H_INCLUDED diff --git a/Plugin/Source/GUI/TapeScope.cpp b/Plugin/Source/GUI/TapeScope.cpp @@ -4,14 +4,14 @@ using namespace foleys; namespace { - constexpr int rmsMS = 5000; // rms window milliseconds - constexpr float xPad = 3.0f; -} +constexpr int rmsMS = 5000; // rms window milliseconds +constexpr float xPad = 3.0f; +} // namespace void TapeScope::prepareToPlay (int numChannels, double newSampleRate, int samplesPerBlockExpected) { MagicOscilloscope::prepareToPlay (newSampleRate, samplesPerBlockExpected); - inputSource.setupSource (numChannels, newSampleRate, rmsMS, rmsMS); + inputSource.setupSource (numChannels, newSampleRate, rmsMS, rmsMS); outputSource.setupSource (numChannels, newSampleRate, rmsMS, rmsMS); } @@ -19,13 +19,13 @@ void TapeScope::pushSamples (const AudioBuffer<float>& buffer, AudioType type) { switch (type) { - case Input: - inputSource.pushSamples (buffer); - return; + case Input: + inputSource.pushSamples (buffer); + return; - case Output: - outputSource.pushSamples (buffer); - MagicOscilloscope::pushSamples (buffer); + case Output: + outputSource.pushSamples (buffer); + MagicOscilloscope::pushSamples (buffer); } } @@ -36,8 +36,7 @@ void TapeScope::createPlotPaths (Path& path, Path& filledPath, Rectangle<float> filledPath.clear(); // get strings for I/O dB meters - auto getDBString = [] (const MagicLevelSource& source, AudioType type) -> String - { + auto getDBString = [] (const MagicLevelSource& source, AudioType type) -> String { String prefix = type == Input ? "IN: " : "OUT: "; auto dBVal = Decibels::gainToDecibels (source.getRMSvalue (0), -80.0f); return prefix + String (dBVal, 1) + " dB"; @@ -52,8 +51,7 @@ void TapeScope::createPlotPaths (Path& path, Path& filledPath, Rectangle<float> const auto fontHeight = labelHeight * 0.9f; const auto font = Font (fontHeight); - auto drawLabel = [b, &filledPath, labelHeight, font] (const String& textStr, float x) - { + auto drawLabel = [b, &filledPath, labelHeight, font] (const String& textStr, float x) { auto width = font.getStringWidthFloat (textStr); x = x < b.getCentreX() ? x : x - width; diff --git a/Plugin/Source/GUI/TapeScope.h b/Plugin/Source/GUI/TapeScope.h @@ -21,7 +21,7 @@ public: void createPlotPaths (Path& path, Path& filledPath, Rectangle<float> bounds, foleys::MagicPlotComponent& component) override; private: - foleys::MagicLevelSource inputSource; + foleys::MagicLevelSource inputSource; foleys::MagicLevelSource outputSource; JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TapeScope) diff --git a/Plugin/Source/GUI/TitleComp.cpp b/Plugin/Source/GUI/TitleComp.cpp @@ -12,10 +12,9 @@ void TitleComp::paint (Graphics& g) auto curFont = g.getCurrentFont(); auto b = getLocalBounds(); - auto drawText = [=, &g, &b] (const String& text) - { + auto drawText = [=, &g, &b] (const String& text) { auto width = curFont.getStringWidth (text); - g.drawFittedText (text, b.removeFromLeft (width), Justification::left, 1); + g.drawFittedText (text, b.removeFromLeft (width), Justification::left, 1); }; g.setColour (findColour (text1ColourID)); @@ -35,12 +34,11 @@ void TitleComp::setStrings (String newTitle, String newSubtitle, float newFont) } //====================================================================== -TitleItem::TitleItem (foleys::MagicGUIBuilder& builder, const ValueTree& node) : - foleys::GuiItem (builder, node) +TitleItem::TitleItem (foleys::MagicGUIBuilder& builder, const ValueTree& node) : foleys::GuiItem (builder, node) { setColourTranslation ({ - {"text1", TitleComp::text1ColourID}, - {"text2", TitleComp::text2ColourID}, + { "text1", TitleComp::text1ColourID }, + { "text2", TitleComp::text2ColourID }, }); addAndMakeVisible (comp); @@ -48,7 +46,7 @@ TitleItem::TitleItem (foleys::MagicGUIBuilder& builder, const ValueTree& node) : void TitleItem::update() { - auto titleString = magicBuilder.getStyleProperty (title, configNode).toString(); + auto titleString = magicBuilder.getStyleProperty (title, configNode).toString(); auto subtitleString = magicBuilder.getStyleProperty (subtitle, configNode).toString(); auto fontVal = (float) magicBuilder.getStyleProperty (font, configNode); @@ -58,12 +56,12 @@ void TitleItem::update() std::vector<foleys::SettableProperty> TitleItem::getSettableProperties() const { std::vector<foleys::SettableProperty> settableProperties; - settableProperties.push_back ({ configNode, title, foleys::SettableProperty::Text, {}, {} }); + settableProperties.push_back ({ configNode, title, foleys::SettableProperty::Text, {}, {} }); settableProperties.push_back ({ configNode, subtitle, foleys::SettableProperty::Text, {}, {} }); - settableProperties.push_back ({ configNode, font, foleys::SettableProperty::Number, 0.0f, {} }); + settableProperties.push_back ({ configNode, font, foleys::SettableProperty::Number, 0.0f, {} }); return settableProperties; } -const Identifier TitleItem::title { "title" }; +const Identifier TitleItem::title { "title" }; const Identifier TitleItem::subtitle { "subtitle" }; -const Identifier TitleItem::font { "font" }; +const Identifier TitleItem::font { "font" }; diff --git a/Plugin/Source/GUI/TitleComp.h b/Plugin/Source/GUI/TitleComp.h @@ -23,7 +23,7 @@ private: String subtitle; float font = 0.0f; - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(TitleComp) + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TitleComp) }; class TitleItem : public foleys::GuiItem @@ -45,7 +45,7 @@ public: private: TitleComp comp; - JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(TitleItem) + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (TitleItem) }; #endif // TITLECOMP_H_INCLUDED diff --git a/Plugin/Source/GUI/TooltipComp.cpp b/Plugin/Source/GUI/TooltipComp.cpp @@ -30,19 +30,18 @@ void TooltipComponent::paint (Graphics& g) auto whitespace = String(); auto font = g.getCurrentFont(); - while (font.getStringWidth(whitespace) < font.getStringWidth (name + ": ")) + while (font.getStringWidth (whitespace) < font.getStringWidth (name + ": ")) whitespace += " "; g.setColour (findColour (textColourID)); - g.drawMultiLineText (whitespace + tip, b.getX(), - b.getY() + (int) font.getHeight() - 3, b.getWidth(), Justification::topLeft); + g.drawMultiLineText (whitespace + tip, b.getX(), b.getY() + (int) font.getHeight() - 3, b.getWidth(), Justification::topLeft); } } void TooltipComponent::getTipFor (Component& c, String& newTip, String& newName) { if (Process::isForegroundProcess() - && ! ModifierKeys::currentModifiers.isAnyMouseButtonDown()) + && ! ModifierKeys::currentModifiers.isAnyMouseButtonDown()) { if (auto* ttc = dynamic_cast<TooltipClient*> (&c)) { diff --git a/Plugin/Source/GUI/TooltipComp.h b/Plugin/Source/GUI/TooltipComp.h @@ -32,13 +32,12 @@ class TooltipItem : public foleys::GuiItem public: FOLEYS_DECLARE_GUI_FACTORY (TooltipItem) - TooltipItem (foleys::MagicGUIBuilder& builder, const ValueTree& node) : - foleys::GuiItem (builder, node) + TooltipItem (foleys::MagicGUIBuilder& builder, const ValueTree& node) : foleys::GuiItem (builder, node) { setColourTranslation ({ - {"tooltip-background", TooltipComponent::backgroundColourID}, - {"tooltip-text", TooltipComponent::textColourID}, - {"tooltip-name", TooltipComponent::nameColourID}, + { "tooltip-background", TooltipComponent::backgroundColourID }, + { "tooltip-text", TooltipComponent::textColourID }, + { "tooltip-name", TooltipComponent::nameColourID }, }); addAndMakeVisible (tooltipComp); diff --git a/Plugin/Source/Headless/Benchmarks.cpp b/Plugin/Source/Headless/Benchmarks.cpp @@ -0,0 +1,127 @@ +#include "Benchmarks.h" +#include "../PluginProcessor.h" + +namespace +{ +constexpr double pluginSampleRate = 44100.0; +constexpr int samplesPerBlock = 256; +constexpr int numChannels = 2; +} // namespace + +Benchmarks::Benchmarks() +{ + this->commandOption = "--bench"; + this->argumentDescription = "--bench --file=FILE --mode=MODE"; + this->shortDescription = "Runs benchmarks for ChowTapeModel documentation"; + this->longDescription = ""; + this->command = std::bind (&Benchmarks::runBenchmarks, this, std::placeholders::_1); +} + +void getAudioFile (AudioBuffer<float>& buffer, const File& file) +{ + AudioFormatManager formatManager; + formatManager.registerBasicFormats(); + + std::unique_ptr<InputStream> inputStream = file.createInputStream(); + if (inputStream == nullptr) + return; + + std::unique_ptr<AudioFormatReader> reader (formatManager.createReaderFor (std::move (inputStream))); + if (reader == nullptr) + return; + + buffer.setSize ((int) reader->numChannels, (int) reader->lengthInSamples); + reader->read (buffer.getArrayOfWritePointers(), buffer.getNumChannels(), 0, buffer.getNumSamples()); +} + +void setParameters (AudioProcessor* plugin, int mode) +{ + auto params = plugin->getParameters(); + for (auto param : params) + { + if (param->getName (1024) == "Oversampling") + { + param->setValue (3.0f / 4.0f); // 8x + std::cout << "Setting parameter " << param->getName (1024) + << ": " << param->getText (param->getValue(), 1024) << std::endl; + } + + if (param->getName (1024) == "Mode") + { + param->setValue ((float) mode / 5.0f); // STN + std::cout << "Setting parameter " << param->getName (1024) + << ": " << param->getText (param->getValue(), 1024) << std::endl; + } + } +} + +double timeAudioProcess (AudioProcessor* plugin, AudioBuffer<float>& audio, const int blockSize) +{ + Time time; + + auto totalNumSamples = audio.getNumSamples(); + int samplePtr = 0; + MidiBuffer midi; + + auto start = time.getMillisecondCounterHiRes(); + while (totalNumSamples > 0) + { + auto curBlockSize = jmin (totalNumSamples, blockSize); + totalNumSamples -= curBlockSize; + + AudioBuffer<float> curBuff (audio.getArrayOfWritePointers(), numChannels, samplePtr, curBlockSize); + plugin->processBlock (curBuff, midi); + + samplePtr += curBlockSize; + } + + return (time.getMillisecondCounterHiRes() - start) / 1000.0; +} + +void Benchmarks::runBenchmarks (const ArgumentList& args) +{ + ignoreUnused (args); + + std::cout << "Loading plugin..." << std::endl; + auto plugin = std::make_unique<ChowtapeModelAudioProcessor>(); + + File audioFile; + if (args.containsOption ("--file")) + { + audioFile = args.getExistingFileForOption ("--file"); + } + else + { + auto rootFolder = File::getSpecialLocation (File::currentExecutableFile); + while (rootFolder.getFileName() != "AnalogTapeModel") + rootFolder = rootFolder.getParentDirectory(); + + audioFile = rootFolder.getChildFile ("Testing/Canada_Dry.wav"); + } + + std::cout << "Loading audio file: " << audioFile.getFullPathName() << std::endl; + AudioBuffer<float> audio; + getAudioFile (audio, audioFile); + const double audioLength = audio.getNumSamples() / pluginSampleRate; // seconds + + if (audioLength == 0.0) + { + std::cout << "No audio found in file!" << std::endl; + return; + } + + std::cout << "Setting parameters..." << std::endl; + int mode = 4; // STN + if (args.containsOption ("--mode")) + mode = args.getValueForOption ("--mode").getIntValue(); + setParameters (plugin.get(), mode); + + std::cout << "Processing audio..." << std::endl; + plugin->prepareToPlay (pluginSampleRate, samplesPerBlock); + auto time = timeAudioProcess (plugin.get(), audio, samplesPerBlock); + plugin->releaseResources(); + + std::cout << "Results:" << std::endl; + std::cout << audioLength / time << "x real-time" << std::endl; + std::cout << time << " seconds" << std::endl; +} diff --git a/Plugin/Source/Headless/Benchmarks.h b/Plugin/Source/Headless/Benchmarks.h @@ -0,0 +1,18 @@ +#ifndef BENCHMARKS_H_INCLUDED +#define BENCHMARKS_H_INCLUDED + +#include <JuceHeader.h> + +class Benchmarks : public ConsoleApplication::Command +{ +public: + Benchmarks(); + +private: + /** Run benchmarks for ChowTape */ + void runBenchmarks (const ArgumentList& args); + + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Benchmarks) +}; + +#endif // BENCHMARKS_H_INCLUDED diff --git a/Plugin/Source/Headless/CMakeLists.txt b/Plugin/Source/Headless/CMakeLists.txt @@ -0,0 +1,24 @@ +juce_add_console_app(ChowTapeModel_Headless + PRODUCT_NAME "ChowTapeModel" + COMPANY_NAME chowdsp +) + +juce_generate_juce_header(ChowTapeModel_Headless) +add_custom_command(TARGET ChowTapeModel_Headless + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E echo "copying $<TARGET_FILE:ChowTapeModel_Headless> to ${PROJECT_BINARY_DIR}/ChowTapeModel" + COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:ChowTapeModel_Headless> ${PROJECT_BINARY_DIR}/ChowTapeModel) + +target_sources(ChowTapeModel_Headless PRIVATE + Main.cpp + + Benchmarks.cpp + ScreenshotHelper.cpp +) + +target_include_directories(ChowTapeModel_Headless PRIVATE ../) + +target_link_libraries(ChowTapeModel_Headless PUBLIC + BinaryData + CHOWTapeModel +) diff --git a/Plugin/Source/Headless/Main.cpp b/Plugin/Source/Headless/Main.cpp @@ -0,0 +1,35 @@ +#include "Benchmarks.h" +#include "ScreenshotHelper.h" +#include <JuceHeader.h> + +String getVersion() +{ + return String (ProjectInfo::projectName) + " - " + ProjectInfo::versionString; +} + +String getHelp() +{ + return "ChowTapeModel Headless Interface:"; +} + +int main (int argc, char* argv[]) +{ + std::cout << "Running ChowTapeModel in headless mode..." << std::endl; + +#if JUCE_MAC + Process::setDockIconVisible (false); // hide dock icon +#endif + ScopedJuceInitialiser_GUI scopedJuce; // creates MessageManager + + ConsoleApplication app; + app.addVersionCommand ("--version", getVersion()); + app.addHelpCommand ("--help|-h", getHelp(), true); + + ScreenshotHelper screenshooter; + app.addCommand (screenshooter); + + Benchmarks benchmarks; + app.addCommand (benchmarks); + + return app.findAndRunCommand (argc, argv); +} diff --git a/Plugin/Source/Headless/ScreenshotHelper.cpp b/Plugin/Source/Headless/ScreenshotHelper.cpp @@ -0,0 +1,117 @@ +#include "ScreenshotHelper.h" +#include "../PluginProcessor.h" + +ScreenshotHelper::ScreenshotHelper() +{ + this->commandOption = "--screenshots"; + this->argumentDescription = "--screenshots --out=[DIR]"; + this->shortDescription = "Generates screenshots for ChowTapeModel documentation"; + this->longDescription = ""; + this->command = std::bind (&ScreenshotHelper::takeScreenshots, this, std::placeholders::_1); +} + +/** + * Process audio through the plugin so the screenshots have + * some signal show up in the meters and scopes. + */ +void processAudio (ChowtapeModelAudioProcessor* plugin) +{ + constexpr double fs = 48000.0; + constexpr int blockSize = 1024; + constexpr float freq = 200.0f; + + AudioBuffer<float> buffer (2, blockSize); + for (int ch = 0; ch < 2; ++ch) + { + auto* data = buffer.getWritePointer (ch); + for (int n = 0; n < blockSize; ++n) + data[n] = -0.7f * std::cos (MathConstants<float>::twoPi * freq * (float) n / (float) fs); + } + + plugin->prepareToPlay (fs, blockSize); + + MidiBuffer midi; + plugin->processBlock (buffer, midi); +} + +void findTabbedComponents (Component* root, Array<foleys::Container*>& tabbedComps) +{ + if (root == nullptr) + return; + + for (auto child : root->getChildren()) + { + if (auto tabbedComponent = dynamic_cast<foleys::Container*> (child)) + { + if (tabbedComponent->layout == foleys::Container::Layout::Tabbed) + tabbedComps.add (tabbedComponent); + } + + findTabbedComponents (child, tabbedComps); + } +} + +void ScreenshotHelper::screenshotTab (foleys::Container* container, int tabIdx, const File& outDir) +{ + container->tabbedButtons->setCurrentTabIndex (tabIdx); + auto name = container->tabbedButtons->getTabButton (tabIdx)->getName(); + + int index = 0; + for (auto& child : container->children) + child->setVisible (tabIdx == index++); + + screenshotForBounds (container, container->getLocalBounds(), outDir, name + ".png"); +} + +void ScreenshotHelper::takeScreenshots (const ArgumentList& args) +{ + File outputDir = File::getCurrentWorkingDirectory(); + if (args.containsOption ("--out")) + outputDir = args.getExistingFolderForOption ("--out"); + + std::cout << "Generating screenshots... Saving to " << outputDir.getFullPathName() << std::endl; + + auto plugin = std::make_unique<ChowtapeModelAudioProcessor>(); + processAudio (plugin.get()); + std::unique_ptr<AudioProcessorEditor> editor (plugin->createEditorIfNeeded()); + + // make sure all plugin sections are enabled + StringArray onOffIDs { "ifilt_onoff", "hyst_onoff", "tone_onoff", "loss_onoff", "chew_onoff", "deg_onoff", "flutter_onoff" }; + for (auto param : plugin->getParameters()) + { + if (auto* paramCast = dynamic_cast<RangedAudioParameter*> (param)) + { + if (onOffIDs.contains (paramCast->paramID)) + paramCast->setValueNotifyingHost (1.0f); + } + } + + // full screenshot + screenshotForBounds (editor.get(), editor->getLocalBounds(), outputDir, "full_gui.png"); + + // get tabbed components + Array<foleys::Container*> tabbedComps; + findTabbedComponents (editor.get(), tabbedComps); + + for (auto c : tabbedComps) + for (int i = 0; i < c->tabbedButtons->getNumTabs(); ++i) + screenshotTab (c, i, outputDir); + + plugin->editorBeingDeleted (editor.get()); +} + +void ScreenshotHelper::screenshotForBounds (Component* editor, Rectangle<int> bounds, const File& dir, const String& filename) +{ + auto screenshot = editor->createComponentSnapshot (bounds); + + File pngFile = dir.getChildFile (filename); + pngFile.deleteFile(); + pngFile.create(); + auto pngStream = pngFile.createOutputStream(); + + if (pngStream->openedOk()) + { + PNGImageFormat pngImage; + pngImage.writeImageToStream (screenshot, *pngStream.get()); + } +} diff --git a/Plugin/Source/Headless/ScreenshotHelper.h b/Plugin/Source/Headless/ScreenshotHelper.h @@ -0,0 +1,29 @@ +#ifndef SCREENSHOTHELPER_H_INCLUDED +#define SCREENSHOTHELPER_H_INCLUDED + +// weird hack, but I need acces to some private +// member variables from foleys::Container +#define _XKEYCHECK_H +#define private public +#include <JuceHeader.h> +#undef private + +class ScreenshotHelper : public ConsoleApplication::Command +{ +public: + ScreenshotHelper(); + +private: + /** Take a series of screenshots used for the plugin documentation */ + void takeScreenshots (const ArgumentList& args); + + /** Take a single screenshot for a given rectangle */ + void screenshotForBounds (Component* editor, Rectangle<int> bounds, const File& dir, const String& filename); + + /** Takes a screenshot from an individual tab of a TabbedComponent */ + void screenshotTab (foleys::Container* container, int tabIdx, const File& dir); + + JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ScreenshotHelper) +}; + +#endif // SCREENSHOTHELPER_H_INCLUDED diff --git a/Plugin/Source/MixGroups/MixGroupsController.cpp b/Plugin/Source/MixGroups/MixGroupsController.cpp @@ -3,8 +3,7 @@ using namespace MixGroupsConstants; MixGroupsController::MixGroupsController (AudioProcessorValueTreeState& vts, - AudioProcessor* proc) : - vts (vts) + AudioProcessor* proc) : vts (vts) { // load parameters auto params = proc->getParameters(); @@ -24,7 +23,7 @@ MixGroupsController::~MixGroupsController() void MixGroupsController::createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params) { - params.push_back (std::make_unique<AudioParameterChoice> (mixGroupParamID, "Mix Group", StringArray ({"N/A", "1", "2", "3", "4"}), 0)); + params.push_back (std::make_unique<AudioParameterChoice> (mixGroupParamID, "Mix Group", StringArray ({ "N/A", "1", "2", "3", "4" }), 0)); } void MixGroupsController::loadParameterList (Array<AudioProcessorParameter*>& params) @@ -69,7 +68,7 @@ void MixGroupsController::parameterChanged (const String& parameterID, float new } else if (numPluginsInGroup > 1) // there are already plugins in this group { - // copy shared state to me + // copy shared state to me for (const auto& paramID : paramList) { auto param = vts.getParameter (paramID); @@ -104,7 +103,7 @@ void MixGroupsController::mixGroupParamChanged (const String& paramID, int mixGr if (mixGroup != (int) mixGroupParam->load()) // received message does not apply to this mix group return; - + // set parameter value lastParameterChanged = paramID; param->setValueNotifyingHost (param->convertTo0to1 (value)); diff --git a/Plugin/Source/MixGroups/MixGroupsController.h b/Plugin/Source/MixGroups/MixGroupsController.h @@ -5,9 +5,9 @@ namespace MixGroupsConstants { - constexpr int numMixGroups = 4; - const String mixGroupParamID = "mix_group"; -} +constexpr int numMixGroups = 4; +const String mixGroupParamID = "mix_group"; +} // namespace MixGroupsConstants /** Class to control syncing parameters between multiple mix groups */ class MixGroupsController : private AudioProcessorValueTreeState::Listener, diff --git a/Plugin/Source/MixGroups/MixGroupsSharedData.cpp b/Plugin/Source/MixGroups/MixGroupsSharedData.cpp @@ -19,7 +19,7 @@ void MixGroupsSharedData::loadParameterList (Array<String>& paramList) for (const auto& paramID : paramList) paramMap->set (paramID, 0.0f); - paramMaps.push_back(std::move (paramMap)); + paramMaps.push_back (std::move (paramMap)); } } @@ -29,7 +29,7 @@ void MixGroupsSharedData::pluginGroupChanged (const String& pluginID, int mixGro for (auto& group : pluginsInGroup) group->removeString (pluginID); - if (mixGroup == 0) + if (mixGroup == 0) return; // add plugin to new group diff --git a/Plugin/Source/PluginProcessor.cpp b/Plugin/Source/PluginProcessor.cpp @@ -10,40 +10,39 @@ #include "PluginProcessor.h" #include "GUI/InfoComp.h" -#include "GUI/TitleComp.h" -#include "GUI/TooltipComp.h" #include "GUI/MixGroupViz.h" #include "GUI/PowerButton.h" -#include "GUI/ScreenshotHelper.h" +#include "GUI/TitleComp.h" +#include "GUI/TooltipComp.h" namespace { - constexpr int maxNumPresets = 999; +constexpr int maxNumPresets = 999; } //============================================================================== ChowtapeModelAudioProcessor::ChowtapeModelAudioProcessor() #ifndef JucePlugin_PreferredChannelConfigurations - : AudioProcessor (BusesProperties() - #if ! JucePlugin_IsMidiEffect - #if ! JucePlugin_IsSynth - .withInput ("Input", AudioChannelSet::stereo(), true) - #endif - .withOutput ("Output", AudioChannelSet::stereo(), true) - #endif - ), + : AudioProcessor (BusesProperties() +#if ! JucePlugin_IsMidiEffect +#if ! JucePlugin_IsSynth + .withInput ("Input", AudioChannelSet::stereo(), true) +#endif + .withOutput ("Output", AudioChannelSet::stereo(), true) +#endif + ), #endif - vts (*this, nullptr, Identifier ("Parameters"), createParameterLayout()), - inputFilters (vts), - toneControl (vts), - hysteresis (vts), - degrade (vts), - chewer (vts), - lossFilter (vts), - flutter (vts), - onOffManager (vts, this), - mixGroupsController (vts, this) -{ + vts (*this, nullptr, Identifier ("Parameters"), createParameterLayout()), + inputFilters (vts), + toneControl (vts), + hysteresis (vts), + degrade (vts), + chewer (vts), + lossFilter (vts), + flutter (vts), + onOffManager (vts, this), + mixGroupsController (vts, this) +{ scope = magicState.createAndAddObject<TapeScope> ("scope"); flutter.initialisePlots (magicState); @@ -64,10 +63,10 @@ AudioProcessorValueTreeState::ParameterLayout ChowtapeModelAudioProcessor::creat { std::vector<std::unique_ptr<RangedAudioParameter>> params; - params.push_back (std::make_unique<AudioParameterFloat> ("ingain", "Input Gain [dB]", -30.0f, 6.0f, 0.0f)); + params.push_back (std::make_unique<AudioParameterFloat> ("ingain", "Input Gain [dB]", -30.0f, 6.0f, 0.0f)); params.push_back (std::make_unique<AudioParameterFloat> ("outgain", "Output Gain [dB]", -30.0f, 30.0f, 0.0f)); - params.push_back (std::make_unique<AudioParameterFloat> ("drywet", "Dry/Wet", 0.0f, 100.0f, 100.0f)); - params.push_back (std::make_unique<AudioParameterInt> ("preset", "Preset", 0, maxNumPresets, 0)); + params.push_back (std::make_unique<AudioParameterFloat> ("drywet", "Dry/Wet", 0.0f, 100.0f, 100.0f)); + params.push_back (std::make_unique<AudioParameterInt> ("preset", "Preset", 0, maxNumPresets, 0)); InputFilters::createParameterLayout (params); ToneControl::createParameterLayout (params); @@ -89,29 +88,29 @@ const String ChowtapeModelAudioProcessor::getName() const bool ChowtapeModelAudioProcessor::acceptsMidi() const { - #if JucePlugin_WantsMidiInput +#if JucePlugin_WantsMidiInput return true; - #else +#else return false; - #endif +#endif } bool ChowtapeModelAudioProcessor::producesMidi() const { - #if JucePlugin_ProducesMidiOutput +#if JucePlugin_ProducesMidiOutput return true; - #else +#else return false; - #endif +#endif } bool ChowtapeModelAudioProcessor::isMidiEffect() const { - #if JucePlugin_IsMidiEffect +#if JucePlugin_IsMidiEffect return true; - #else +#else return false; - #endif +#endif } double ChowtapeModelAudioProcessor::getTailLengthSeconds() const @@ -137,7 +136,7 @@ void ChowtapeModelAudioProcessor::setCurrentProgram (int index) auto& presetParam = *vts.getRawParameterValue ("preset"); if ((int) presetParam == index) return; - + if (presetManager.setPreset (vts, index)) { presetParam = (float) index; @@ -171,10 +170,10 @@ void ChowtapeModelAudioProcessor::prepareToPlay (double sampleRate, int samplesP dryDelay.prepare ({ sampleRate, (uint32) samplesPerBlock, 2 }); dryDelay.setDelay (calcLatencySamples()); - + flutter.prepareToPlay (sampleRate, samplesPerBlock); outGain.prepareToPlay (sampleRate, samplesPerBlock); - + scope->prepareToPlay (getMainBusNumInputChannels(), sampleRate, samplesPerBlock); dryWet.setDryWet (*vts.getRawParameterValue ("drywet") / 100.0f); @@ -197,24 +196,24 @@ float ChowtapeModelAudioProcessor::calcLatencySamples() const noexcept #ifndef JucePlugin_PreferredChannelConfigurations bool ChowtapeModelAudioProcessor::isBusesLayoutSupported (const BusesLayout& layouts) const { - #if JucePlugin_IsMidiEffect +#if JucePlugin_IsMidiEffect ignoreUnused (layouts); return true; - #else +#else // This is the place where you check if the layout is supported. // In this template code we only support mono or stereo. if (layouts.getMainOutputChannelSet() != AudioChannelSet::mono() - && layouts.getMainOutputChannelSet() != AudioChannelSet::stereo()) + && layouts.getMainOutputChannelSet() != AudioChannelSet::stereo()) return false; - // This checks if the input layout matches the output layout - #if ! JucePlugin_IsSynth + // This checks if the input layout matches the output layout +#if ! JucePlugin_IsSynth if (layouts.getMainOutputChannelSet() != layouts.getMainInputChannelSet()) return false; - #endif +#endif return true; - #endif +#endif } #endif @@ -230,11 +229,11 @@ void ChowtapeModelAudioProcessor::processBlockBypassed (AudioBuffer<float>& buff void ChowtapeModelAudioProcessor::processBlock (AudioBuffer<float>& buffer, MidiBuffer& midiMessages) { ScopedNoDenormals noDenormals; - - inGain.setGain (Decibels::decibelsToGain (vts.getRawParameterValue ("ingain")->load())); + + inGain.setGain (Decibels::decibelsToGain (vts.getRawParameterValue ("ingain")->load())); outGain.setGain (Decibels::decibelsToGain (vts.getRawParameterValue ("outgain")->load())); dryWet.setDryWet (*vts.getRawParameterValue ("drywet") / 100.0f); - + dryBuffer.makeCopyOf (buffer, true); inGain.processBlock (buffer, midiMessages); inputFilters.processBlock (buffer); @@ -248,13 +247,13 @@ void ChowtapeModelAudioProcessor::processBlock (AudioBuffer<float>& buffer, Midi degrade.processBlock (buffer, midiMessages); flutter.processBlock (buffer, midiMessages); lossFilter.processBlock (buffer); - + latencyCompensation(); inputFilters.processBlockMakeup (buffer); outGain.processBlock (buffer, midiMessages); dryWet.processBlock (dryBuffer, buffer); - + scope->pushSamples (buffer, TapeScope::AudioType::Output); } @@ -334,9 +333,5 @@ void ChowtapeModelAudioProcessor::setStateInformation (const void* data, int siz // This creates new instances of the plugin.. AudioProcessor* JUCE_CALLTYPE createPluginFilter() { -#ifdef TAKE_SCREENSHOTS - ScreenshotHelper::takeScreenshots (std::make_unique<ChowtapeModelAudioProcessor>()); -#endif - return new ChowtapeModelAudioProcessor(); } diff --git a/Plugin/Source/PluginProcessor.h b/Plugin/Source/PluginProcessor.h @@ -10,22 +10,22 @@ #pragma once -#include "../JuceLibraryCode/JuceHeader.h" +#include "GUI/AutoUpdating.h" +#include "GUI/MyLNF.h" +#include "GUI/OnOffManager.h" +#include "GUI/TapeScope.h" +#include "MixGroups/MixGroupsController.h" +#include "Presets/PresetManager.h" +#include "Processors/Chew/ChewProcessor.h" +#include "Processors/Degrade/DegradeProcessor.h" +#include "Processors/DryWetProcessor.h" #include "Processors/GainProcessor.h" #include "Processors/Hysteresis/HysteresisProcessor.h" #include "Processors/Hysteresis/ToneControl.h" +#include "Processors/Input_Filters/InputFilters.h" #include "Processors/Loss_Effects/LossFilter.h" #include "Processors/Timing_Effects/Flutter.h" -#include "Processors/Degrade/DegradeProcessor.h" -#include "Processors/Chew/ChewProcessor.h" -#include "Processors/DryWetProcessor.h" -#include "Processors/Input_Filters/InputFilters.h" -#include "Presets/PresetManager.h" -#include "GUI/MyLNF.h" -#include "GUI/AutoUpdating.h" -#include "GUI/TapeScope.h" -#include "MixGroups/MixGroupsController.h" -#include "GUI/OnOffManager.h" +#include <JuceHeader.h> //============================================================================== /** @@ -41,9 +41,9 @@ public: void prepareToPlay (double sampleRate, int samplesPerBlock) override; void releaseResources() override; - #ifndef JucePlugin_PreferredChannelConfigurations +#ifndef JucePlugin_PreferredChannelConfigurations bool isBusesLayoutSupported (const BusesLayout& layouts) const override; - #endif +#endif void processBlock (AudioBuffer<float>&, MidiBuffer&) override; void processBlockBypassed (AudioBuffer<float>&, MidiBuffer&) override; @@ -74,7 +74,7 @@ public: PresetManager& getPresetManager() { return presetManager; } const AudioProcessorValueTreeState& getVTS() { return vts; } - + private: AudioProcessorValueTreeState::ParameterLayout createParameterLayout(); void latencyCompensation(); @@ -95,7 +95,7 @@ private: OnOffManager onOffManager; AudioBuffer<float> dryBuffer; - + foleys::MagicProcessorState magicState { *this, vts }; TapeScope* scope = nullptr; diff --git a/Plugin/Source/Presets/CMakeLists.txt b/Plugin/Source/Presets/CMakeLists.txt @@ -0,0 +1,3 @@ +target_sources(CHOWTapeModel PRIVATE + Prese +) diff --git a/Plugin/Source/Presets/PresetComp.cpp b/Plugin/Source/Presets/PresetComp.cpp @@ -1,8 +1,7 @@ #include "PresetComp.h" -PresetComp::PresetComp (ChowtapeModelAudioProcessor& proc, PresetManager& manager) : - proc (proc), - manager (manager) +PresetComp::PresetComp (ChowtapeModelAudioProcessor& proc, PresetManager& manager) : proc (proc), + manager (manager) { manager.addListener (this); @@ -28,7 +27,7 @@ PresetComp::PresetComp (ChowtapeModelAudioProcessor& proc, PresetManager& manage presetNameEditor.setJustification (Justification::centred); presetUpdated(); - presetBox.onChange = [=, &proc] { + presetBox.onChange = [=, &proc] { const auto selectedId = presetBox.getSelectedId(); if (selectedId >= 1000 || selectedId <= 0) return; @@ -56,11 +55,11 @@ void PresetComp::loadPresetChoices() continue; category = (category == choice) ? "CHOW" : category; String presetName = choice.fromLastOccurrenceOf ("_", false, false); - + if (presetChoicesMap.find (category) == presetChoicesMap.end()) presetChoicesMap[category] = PopupMenu(); - presetChoicesMap[category].addItem (i+1, presetName); + presetChoicesMap[category].addItem (i + 1, presetName); } for (auto& presetGroup : presetChoicesMap) @@ -104,7 +103,7 @@ void PresetComp::addPresetOptions() void PresetComp::paint (Graphics& g) { - constexpr auto cornerSize = 5.0f; + constexpr auto cornerSize = 5.0f; presetBox.setColour (PopupMenu::ColourIds::backgroundColourId, findColour (backgroundColourId)); g.setColour (findColour (backgroundColourId)); @@ -133,7 +132,7 @@ void PresetComp::saveUserPreset() presetNameEditor.onReturnKey = [=] { auto presetName = presetNameEditor.getText(); presetNameEditor.setVisible (false); - + if (manager.saveUserPreset (presetName, proc.getVTS())) { loadPresetChoices(); diff --git a/Plugin/Source/Presets/PresetComp.h b/Plugin/Source/Presets/PresetComp.h @@ -1,8 +1,8 @@ #ifndef PRESETCOMP_H_INCLUDED #define PRESETCOMP_H_INCLUDED -#include "PresetManager.h" #include "../PluginProcessor.h" +#include "PresetManager.h" class PresetComp : public Component, private PresetManager::Listener @@ -39,13 +39,10 @@ class PresetComponentItem : public foleys::GuiItem public: FOLEYS_DECLARE_GUI_FACTORY (PresetComponentItem) - PresetComponentItem (foleys::MagicGUIBuilder& builder, const ValueTree& node) : - foleys::GuiItem (builder, node) + PresetComponentItem (foleys::MagicGUIBuilder& builder, const ValueTree& node) : foleys::GuiItem (builder, node) { - setColourTranslation ({ - {"presets-background", PresetComp::backgroundColourId}, - {"presets-text", PresetComp::textColourId} - }); + setColourTranslation ({ { "presets-background", PresetComp::backgroundColourId }, + { "presets-text", PresetComp::textColourId } }); if (auto* proc = dynamic_cast<ChowtapeModelAudioProcessor*> (builder.getMagicState().getProcessor())) { diff --git a/Plugin/Source/Presets/PresetManager.cpp b/Plugin/Source/Presets/PresetManager.cpp @@ -4,7 +4,7 @@ namespace { - static String userPresetPath = "ChowdhuryDSP/ChowTape/UserPresets.txt"; +static String userPresetPath = "ChowdhuryDSP/ChowTape/UserPresets.txt"; } Preset::Preset (String presetFile) @@ -22,7 +22,6 @@ Preset::Preset (String presetFile) jassert (xmlText.isNotEmpty()); // preset does not exist!! initialise (ValueTree::fromXml (xmlText)); - } Preset::Preset (const File& presetFile) @@ -149,7 +148,7 @@ bool PresetManager::saveUserPreset (const String& name, const AudioProcessorValu // create preset XML auto presetXml = std::make_unique<XmlElement> ("Preset"); presetXml->setAttribute ("name", "User_" + name); - + auto xmlParameters = std::make_unique<XmlElement> ("Parameters"); forEachXmlChildElementWithTagName (*stateXml, p, "PARAM") { diff --git a/Plugin/Source/Presets/PresetManager.h b/Plugin/Source/Presets/PresetManager.h @@ -22,7 +22,7 @@ public: StringArray getPresetChoices(); void loadPresets(); - + int getNumPresets() const { return presets.size(); } String getPresetName (int idx); bool setPreset (AudioProcessorValueTreeState& vts, int idx); diff --git a/Plugin/Source/Processors/BilinearUtils.h b/Plugin/Source/Processors/BilinearUtils.h @@ -4,22 +4,21 @@ namespace Bilinear { - /** Dummy generic bilinear transform (@TODO: actually implement this) */ -template<typename T, size_t N> +template <typename T, size_t N> struct BilinearTransform { static inline void call (T (&b)[N], T (&a)[N], T (&bs)[N], T (&as)[N], T K); }; /** Bilinear transform for a first-order filter */ -template<typename T> +template <typename T> struct BilinearTransform<T, 2> { static inline void call (T (&b)[2], T (&a)[2], T (&bs)[2], T (&as)[2], T K) { const auto a0 = as[0] * K + as[1]; - b[0] = ( bs[0] * K + bs[1]) / a0; + b[0] = (bs[0] * K + bs[1]) / a0; b[1] = (-bs[0] * K + bs[1]) / a0; a[0] = 1.0f; a[1] = (-as[0] * K + as[1]) / a0; @@ -27,7 +26,7 @@ struct BilinearTransform<T, 2> }; /** Bilinear transform for a second-order filter */ -template<typename T> +template <typename T> struct BilinearTransform<T, 3> { static inline void call (T (&b)[3], T (&a)[3], T (&bs)[3], T (&as)[3], T K) @@ -46,11 +45,11 @@ struct BilinearTransform<T, 3> inline float calcPoleFreq (float a, float b, float c) { - auto radicand = b*b - 4.0f*a*c; + auto radicand = b * b - 4.0f * a * c; if (radicand >= 0.0f) return 0.0f; return std::sqrt (-radicand) / (2.0f * a); } -} // Bilinear +} // namespace Bilinear diff --git a/Plugin/Source/Processors/BypassProcessor.h b/Plugin/Source/Processors/BypassProcessor.h @@ -44,14 +44,13 @@ public: const auto numChannels = block.getNumChannels(); const auto numSamples = block.getNumSamples(); - float startGain = onOffParam == false ? 1.0f // fade out + float startGain = onOffParam == false ? 1.0f // fade out : 0.0f; // fade in float endGain = 1.0f - startGain; block.applyGainRamp (0, numSamples, startGain, endGain); for (int ch = 0; ch < numChannels; ++ch) - block.addFromWithRamp (ch, 0, fadeBuffer.getReadPointer (ch), numSamples, - 1.0f - startGain, 1.0f - endGain); + block.addFromWithRamp (ch, 0, fadeBuffer.getReadPointer (ch), numSamples, 1.0f - startGain, 1.0f - endGain); prevOnOffParam = onOffParam; } diff --git a/Plugin/Source/Processors/CMakeLists.txt b/Plugin/Source/Processors/CMakeLists.txt @@ -0,0 +1,14 @@ +target_sources(CHOWTapeModel PRIVATE + Chew/ChewProcessor.cpp + Degrade/DegradeProcessor.cpp + + Hysteresis/HysteresisProcessing.cpp + Hysteresis/HysteresisProcessor.cpp + Hysteresis/HysteresisSTN.cpp + Hysteresis/ToneControl.cpp + Hysteresis/RTNeural/src/Json2RnnParser.cpp + + Input_Filters/InputFilters.cpp + Loss_Effects/LossFilter.cpp + Timing_Effects/Flutter.cpp +) diff --git a/Plugin/Source/Processors/Chew/ChewProcessor.cpp b/Plugin/Source/Processors/Chew/ChewProcessor.cpp @@ -3,17 +3,17 @@ ChewProcessor::ChewProcessor (AudioProcessorValueTreeState& vts) { depth = vts.getRawParameterValue ("chew_depth"); - freq = vts.getRawParameterValue ("chew_freq"); - var = vts.getRawParameterValue ("chew_var"); + freq = vts.getRawParameterValue ("chew_freq"); + var = vts.getRawParameterValue ("chew_var"); onOff = vts.getRawParameterValue ("chew_onoff"); } void ChewProcessor::createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params) { - params.push_back (std::make_unique<AudioParameterFloat> ("chew_depth", "Depth", 0.0f, 1.0f, 0.0f)); - params.push_back (std::make_unique<AudioParameterFloat> ("chew_freq", "Freq", 0.0f, 1.0f, 0.0f)); - params.push_back (std::make_unique<AudioParameterFloat> ("chew_var", "Variance", 0.0f, 1.0f, 0.0f)); - params.push_back (std::make_unique<AudioParameterBool> ("chew_onoff", "On/Off", false)); + params.push_back (std::make_unique<AudioParameterFloat> ("chew_depth", "Depth", 0.0f, 1.0f, 0.0f)); + params.push_back (std::make_unique<AudioParameterFloat> ("chew_freq", "Freq", 0.0f, 1.0f, 0.0f)); + params.push_back (std::make_unique<AudioParameterFloat> ("chew_var", "Variance", 0.0f, 1.0f, 0.0f)); + params.push_back (std::make_unique<AudioParameterBool> ("chew_onoff", "On/Off", false)); } void ChewProcessor::prepare (double sr, int samplesPerBlock) @@ -44,10 +44,12 @@ void ChewProcessor::processBlock (AudioBuffer<float>& buffer) else { int sampleIdx = 0; - for(; sampleIdx + shortBlockSize <= buffer.getNumSamples(); sampleIdx += shortBlockSize) + for (; sampleIdx + shortBlockSize <= buffer.getNumSamples(); sampleIdx += shortBlockSize) { AudioBuffer<float> shortBuff (buffer.getArrayOfWritePointers(), - buffer.getNumChannels(), sampleIdx, shortBlockSize); + buffer.getNumChannels(), + sampleIdx, + shortBlockSize); processShortBlock (shortBuff); } @@ -55,7 +57,9 @@ void ChewProcessor::processBlock (AudioBuffer<float>& buffer) if (sampleIdx < buffer.getNumSamples()) { AudioBuffer<float> shortBuff (buffer.getArrayOfWritePointers(), - buffer.getNumChannels(), sampleIdx, buffer.getNumSamples() - sampleIdx); + buffer.getNumChannels(), + sampleIdx, + buffer.getNumSamples() - sampleIdx); processShortBlock (shortBuff); } @@ -86,7 +90,7 @@ void ChewProcessor::processShortBlock (AudioBuffer<float>& buffer) { sampleCounter = 0; isCrinkled = ! isCrinkled; - + if (isCrinkled) // start crinkle { mix = 1.0f; @@ -95,7 +99,7 @@ void ChewProcessor::processShortBlock (AudioBuffer<float>& buffer) filt[1].setFreq (highFreq - freqChange * *depth); samplesUntilChange = getWetTime(); } - else // end crinkle + else // end crinkle { mix = 0.0f; filt[0].setFreq (highFreq); diff --git a/Plugin/Source/Processors/Chew/ChewProcessor.h b/Plugin/Source/Processors/Chew/ChewProcessor.h @@ -1,9 +1,9 @@ #ifndef CHEWPROCESSOR_H_INCLUDED #define CHEWPROCESSOR_H_INCLUDED -#include "Dropout.h" -#include "../Degrade/DegradeFilter.h" #include "../BypassProcessor.h" +#include "../Degrade/DegradeFilter.h" +#include "Dropout.h" class ChewProcessor { @@ -40,7 +40,7 @@ private: auto tScale = pow (*freq, 0.1f); auto varScale = pow (random.nextFloat() * 2.0f, var->load()); return random.nextInt (Range<int> ((int) ((1.0 - tScale) * sampleRate * varScale), - (int) ((2 - 1.99 * tScale) * sampleRate * varScale))); + (int) ((2 - 1.99 * tScale) * sampleRate * varScale))); } inline int getWetTime() @@ -51,7 +51,7 @@ private: auto varScale = pow (random.nextFloat() * 2.0f, var->load()); return random.nextInt (Range<int> ((int) ((1.0 - tScale) * sampleRate * varScale), - (int) (((1.0 - tScale) + start - end * tScale) * sampleRate * varScale))); + (int) (((1.0 - tScale) + start - end * tScale) * sampleRate * varScale))); } JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (ChewProcessor) diff --git a/Plugin/Source/Processors/Degrade/DegradeFilter.h b/Plugin/Source/Processors/Degrade/DegradeFilter.h @@ -10,7 +10,7 @@ public: DegradeFilter() { freq.reset (numSteps); } ~DegradeFilter() {} - void reset (float sampleRate, int steps=0) + void reset (float sampleRate, int steps = 0) { fs = sampleRate; for (int n = 0; n < 2; ++n) @@ -47,13 +47,13 @@ public: inline float processSample (float x) { - float y = z[1] + x*b[0]; - z[1] = x*b[1] - y*a[1]; + float y = z[1] + x * b[0]; + z[1] = x * b[1] - y * a[1]; return y; } void setFreq (float newFreq) - { + { freq.setTargetValue (newFreq); } diff --git a/Plugin/Source/Processors/Degrade/DegradeProcessor.cpp b/Plugin/Source/Processors/Degrade/DegradeProcessor.cpp @@ -4,16 +4,16 @@ DegradeProcessor::DegradeProcessor (AudioProcessorValueTreeState& vts) { onOffParam = vts.getRawParameterValue ("deg_onoff"); depthParam = vts.getRawParameterValue ("deg_depth"); - amtParam = vts.getRawParameterValue ("deg_amt"); - varParam = vts.getRawParameterValue ("deg_var"); + amtParam = vts.getRawParameterValue ("deg_amt"); + varParam = vts.getRawParameterValue ("deg_var"); } void DegradeProcessor::createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params) { - params.push_back (std::make_unique<AudioParameterFloat> ("deg_depth", "Depth", 0.0f, 1.0f, 0.0f)); - params.push_back (std::make_unique<AudioParameterFloat> ("deg_amt", "Amount", 0.0f, 1.0f, 0.0f)); - params.push_back (std::make_unique<AudioParameterFloat> ("deg_var", "Variance", 0.0f, 1.0f, 0.0f)); - params.push_back (std::make_unique<AudioParameterBool> ("deg_onoff", "On/Off", false)); + params.push_back (std::make_unique<AudioParameterFloat> ("deg_depth", "Depth", 0.0f, 1.0f, 0.0f)); + params.push_back (std::make_unique<AudioParameterFloat> ("deg_amt", "Amount", 0.0f, 1.0f, 0.0f)); + params.push_back (std::make_unique<AudioParameterFloat> ("deg_var", "Variance", 0.0f, 1.0f, 0.0f)); + params.push_back (std::make_unique<AudioParameterBool> ("deg_onoff", "On/Off", false)); } void DegradeProcessor::cookParams() diff --git a/Plugin/Source/Processors/Degrade/DegradeProcessor.h b/Plugin/Source/Processors/Degrade/DegradeProcessor.h @@ -1,10 +1,10 @@ #ifndef DEGRADEPROCESSOR_H_INCLUDED #define DEGRADEPROCESSOR_H_INCLUDED -#include "../GainProcessor.h" #include "../BypassProcessor.h" -#include "DegradeNoise.h" +#include "../GainProcessor.h" #include "DegradeFilter.h" +#include "DegradeNoise.h" class DegradeProcessor { @@ -20,8 +20,8 @@ public: private: std::atomic<float>* onOffParam = nullptr; std::atomic<float>* depthParam = nullptr; - std::atomic<float>* amtParam = nullptr; - std::atomic<float>* varParam = nullptr; + std::atomic<float>* amtParam = nullptr; + std::atomic<float>* varParam = nullptr; DegradeNoise noiseProc[2]; DegradeFilter filterProc[2]; diff --git a/Plugin/Source/Processors/DryWetProcessor.h b/Plugin/Source/Processors/DryWetProcessor.h @@ -30,10 +30,9 @@ public: for (int ch = 0; ch < wetBuffer.getNumChannels(); ++ch) { wetBuffer.applyGainRamp (ch, 0, wetBuffer.getNumSamples(), lastDryWet, dryWet); - wetBuffer.addFromWithRamp (ch, 0, dryBuffer.getReadPointer (ch), wetBuffer.getNumSamples(), - (1.0f - lastDryWet), (1.0f - dryWet)); + wetBuffer.addFromWithRamp (ch, 0, dryBuffer.getReadPointer (ch), wetBuffer.getNumSamples(), (1.0f - lastDryWet), (1.0f - dryWet)); } - + lastDryWet = dryWet; } } diff --git a/Plugin/Source/Processors/GainProcessor.h b/Plugin/Source/Processors/GainProcessor.h @@ -9,7 +9,7 @@ public: GainProcessor() {} void prepareToPlay (double /*sampleRate*/, int /*maximumExpectedSamplesPerBlock*/) - { + { oldGain = curGain; } @@ -21,7 +21,7 @@ public: oldGain = curGain; return; } - + buffer.applyGain (curGain); } diff --git a/Plugin/Source/Processors/Hysteresis/DCBlocker.h b/Plugin/Source/Processors/Hysteresis/DCBlocker.h @@ -1,8 +1,8 @@ #ifndef DCBLOCKER_H_INCLUDED #define DCBLOCKER_H_INCLUDED -#include <JuceHeader.h> #include "../IIRFilter.h" +#include <JuceHeader.h> /** DC blocking filter */ class DCBlocker @@ -27,7 +27,7 @@ public: void calcCoefs (float fc) { // Q values for 4th-order Butterworth filter - // (https://en.wikipedia.org/wiki/Butterworth_filter#Normalized_Butterworth_polynomials) + // (https://en.wikipedia.org/wiki/Butterworth_filter#Normalized_Butterworth_polynomials) constexpr float Qs[] = { 1.0f / 0.7654f, 1.0f / 1.8478f }; float wc = MathConstants<float>::twoPi * fc / fs; diff --git a/Plugin/Source/Processors/Hysteresis/HysteresisProcessing.cpp b/Plugin/Source/Processors/Hysteresis/HysteresisProcessing.cpp @@ -1,12 +1,12 @@ -#include <math.h> #include "HysteresisProcessing.h" #include "RTNeural/src/Json2RnnParser.h" +#include <math.h> namespace { - constexpr double ONE_THIRD = 1.0 / 3.0; - constexpr double NEG_TWO_OVER_15 = -2.0 / 15.0; -} +constexpr double ONE_THIRD = 1.0 / 3.0; +constexpr double NEG_TWO_OVER_15 = -2.0 / 15.0; +} // namespace inline int sign (double x) { @@ -29,7 +29,7 @@ void HysteresisProcessing::reset() } void HysteresisProcessing::setSampleRate (double newSR) -{ +{ fs = newSR; T = 1.0 / fs; Talpha = T / 1.9; @@ -72,24 +72,24 @@ void HysteresisProcessing::setSolver (SolverType solverType) switch (solverType) { - case SolverType::RK4: - solver = &HysteresisProcessing::RK4; - return; + case SolverType::RK4: + solver = &HysteresisProcessing::RK4; + return; - case SolverType::STN: - solver = &HysteresisProcessing::STN; - return; + case SolverType::STN: + solver = &HysteresisProcessing::STN; + return; - case SolverType::NR4: - numIter = 4; - return; + case SolverType::NR4: + numIter = 4; + return; - case SolverType::NR8: - numIter = 8; - return; + case SolverType::NR8: + numIter = 8; + return; - default: // RK2 - solver = &HysteresisProcessing::RK2; + default: // RK2 + solver = &HysteresisProcessing::RK2; }; } @@ -114,7 +114,8 @@ inline double HysteresisProcessing::langevinD2 (double x) const noexcept if (! nearZero) return 2.0 * coth * (coth * coth - 1.0) - (2.0 / (x * x * x)); else - return NEG_TWO_OVER_15 * x;; + return NEG_TWO_OVER_15 * x; + ; } inline double HysteresisProcessing::hysteresisFunc (double M, double H, double H_d) noexcept diff --git a/Plugin/Source/Processors/Hysteresis/HysteresisProcessing.h b/Plugin/Source/Processors/Hysteresis/HysteresisProcessing.h @@ -1,8 +1,8 @@ #ifndef HYSTERESISPROCESSING_H_INCLUDED #define HYSTERESISPROCESSING_H_INCLUDED -#include "JuceHeader.h" #include "HysteresisSTN.h" +#include "JuceHeader.h" enum SolverType { @@ -49,9 +49,9 @@ public: } private: - inline double langevin (double x) const noexcept; // Langevin function - inline double langevinD (double x) const noexcept; // Derivative of Langevin function - inline double langevinD2 (double x) const noexcept; // 2nd derivative of Langevin function + inline double langevin (double x) const noexcept; // Langevin function + inline double langevinD (double x) const noexcept; // Derivative of Langevin function + inline double langevinD2 (double x) const noexcept; // 2nd derivative of Langevin function inline double deriv (double x_n, double x_n1, double x_d_n1) const noexcept // Derivative by alpha transform { constexpr double dAlpha = 0.75; @@ -92,7 +92,7 @@ private: double upperLim = 20.0; // Save calculations - double nc = 1-c; + double nc = 1 - c; double M_s_oa = M_s / a; double M_s_oa_talpha = alpha * M_s / a; double M_s_oa_tc = c * M_s / a; diff --git a/Plugin/Source/Processors/Hysteresis/HysteresisProcessor.cpp b/Plugin/Source/Processors/Hysteresis/HysteresisProcessor.cpp @@ -15,14 +15,13 @@ HysteresisProcessor::HysteresisProcessor (AudioProcessorValueTreeState& vts) onOffParam = vts.getRawParameterValue ("hyst_onoff"); for (int i = 0; i < 5; ++i) - overSample[i] = std::make_unique<dsp::Oversampling<float>> - (2, i, dsp::Oversampling<float>::filterHalfBandPolyphaseIIR); + overSample[i] = std::make_unique<dsp::Oversampling<float>> (2, i, dsp::Oversampling<float>::filterHalfBandPolyphaseIIR); for (int ch = 0; ch < 2; ++ch) { - drive[ch].reset (numSteps); - width[ch].reset (numSteps); - sat[ch].reset (numSteps); + drive[ch].reset (numSteps); + width[ch].reset (numSteps); + sat[ch].reset (numSteps); makeup[ch].reset (numSteps); } } @@ -33,9 +32,9 @@ void HysteresisProcessor::createParameterLayout (std::vector<std::unique_ptr<Ran params.push_back (std::make_unique<AudioParameterFloat> ("sat", "Saturation", 0.0f, 1.0f, 0.5f)); params.push_back (std::make_unique<AudioParameterFloat> ("width", "Bias", 0.0f, 1.0f, 0.5f)); - params.push_back (std::make_unique<AudioParameterChoice> ("mode", "Mode", StringArray ({"RK2", "RK4", "NR4", "NR8", "STN", "V1"}), 0)); - params.push_back (std::make_unique<AudioParameterChoice> ("os", "Oversampling", StringArray ({"1x", "2x", "4x", "8x", "16x"}), 1)); - params.push_back (std::make_unique<AudioParameterBool> ("hyst_onoff", "On/Off", true)); + params.push_back (std::make_unique<AudioParameterChoice> ("mode", "Mode", StringArray ({ "RK2", "RK4", "NR4", "NR8", "STN", "V1" }), 0)); + params.push_back (std::make_unique<AudioParameterChoice> ("os", "Oversampling", StringArray ({ "1x", "2x", "4x", "8x", "16x" }), 1)); + params.push_back (std::make_unique<AudioParameterBool> ("hyst_onoff", "On/Off", true)); } void HysteresisProcessor::setSolver (int newSolver) @@ -56,18 +55,18 @@ void HysteresisProcessor::setSolver (int newSolver) // set clip level for solver switch (newSolver) { - case 0: // RK2 - case 1: // RK4 - clipLevel = 10.0f; - return; - - case 2: // NR4 - case 3: // NR8 - clipLevel = 12.5f; - return; - - default: - clipLevel = 20.0f; + case 0: // RK2 + case 1: // RK4 + clipLevel = 10.0f; + return; + + case 2: // NR4 + case 3: // NR8 + clipLevel = 12.5f; + return; + + default: + clipLevel = 20.0f; }; } @@ -167,7 +166,7 @@ float HysteresisProcessor::getLatencySamples() const noexcept { // latency of oversampling + fudge factor for hysteresis return onOffParam->load() == 1.0f ? overSample[curOS]->getLatencyInSamples() + 1.4f // on - : 0.0f; // off + : 0.0f; // off } void HysteresisProcessor::processBlock (AudioBuffer<float>& buffer, MidiBuffer& /*midi*/) @@ -194,11 +193,14 @@ void HysteresisProcessor::processBlock (AudioBuffer<float>& buffer, MidiBuffer& // clip input to avoid unstable hysteresis for (int ch = 0; ch < buffer.getNumChannels(); ++ch) FloatVectorOperations::clip (buffer.getWritePointer (ch), - buffer.getWritePointer (ch), -clipLevel, clipLevel, buffer.getNumSamples()); + buffer.getWritePointer (ch), + -clipLevel, + clipLevel, + buffer.getNumSamples()); dsp::AudioBlock<float> block (buffer); dsp::AudioBlock<float> osBlock = overSample[curOS]->processSamplesUp (block); - + if (needsSmoothing) { if (useV1) @@ -213,7 +215,7 @@ void HysteresisProcessor::processBlock (AudioBuffer<float>& buffer, MidiBuffer& else process (osBlock); } - + overSample[curOS]->processSamplesDown (block); applyDCBlockers (buffer); diff --git a/Plugin/Source/Processors/Hysteresis/HysteresisProcessor.h b/Plugin/Source/Processors/Hysteresis/HysteresisProcessor.h @@ -1,9 +1,9 @@ #ifndef HYSTERESISPROCESSOR_H_INCLUDED #define HYSTERESISPROCESSOR_H_INCLUDED -#include "HysteresisProcessing.h" -#include "DCBlocker.h" #include "../BypassProcessor.h" +#include "DCBlocker.h" +#include "HysteresisProcessing.h" /* Hysteresis Processor for tape. */ class HysteresisProcessor diff --git a/Plugin/Source/Processors/Hysteresis/HysteresisSTN.cpp b/Plugin/Source/Processors/Hysteresis/HysteresisSTN.cpp @@ -1,21 +1,18 @@ -#include <future> #include "HysteresisSTN.h" #include "RTNeural/src/Json2RnnParser.h" +#include <future> namespace { - constexpr double trainingSampleRate = 96e3; - - constexpr float satIdxMult = (float) HysteresisSTN::numSatModels - 1.0f; - constexpr float widthIdxMult = (float) HysteresisSTN::numWidthModels - 1.0f; +constexpr double trainingSampleRate = 96e3; - static std::array<String, HysteresisSTN::numWidthModels> widthTags - { "0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"}; +constexpr float satIdxMult = (float) HysteresisSTN::numSatModels - 1.0f; +constexpr float widthIdxMult = (float) HysteresisSTN::numWidthModels - 1.0f; - static std::array<String, HysteresisSTN::numSatModels> satTags - { "0", "5", "10", "15", "20", "25", "30", "35", "40", "45", - "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100" }; -} +static std::array<String, HysteresisSTN::numWidthModels> widthTags { "0", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100" }; + +static std::array<String, HysteresisSTN::numSatModels> satTags { "0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100" }; +} // namespace constexpr size_t getSatIdx (float satParam) { diff --git a/Plugin/Source/Processors/Hysteresis/HysteresisSTN.h b/Plugin/Source/Processors/Hysteresis/HysteresisSTN.h @@ -1,8 +1,8 @@ #ifndef HYSTERESISSTN_H_INCLUDED #define HYSTERESISSTN_H_INCLUDED -#include <JuceHeader.h> #include "RTNeural/src/Model.h" +#include <JuceHeader.h> /** * Class that implements a "State Transition Network" for @@ -23,10 +23,14 @@ public: inline double process (const std::array<double, inputSize>& input) const noexcept { - return stnModels[widthIdx][satIdx]->forward(input.data()) * sampleRateCorr; + return stnModels[widthIdx][satIdx]->forward (input.data()) * sampleRateCorr; } - enum { numWidthModels = 11, numSatModels = 21 }; + enum + { + numWidthModels = 11, + numSatModels = 21 + }; private: std::unique_ptr<MLUtils::Model<double>> stnModels[numWidthModels][numSatModels]; diff --git a/Plugin/Source/Processors/Hysteresis/RTNeural/src/Json2RnnParser.cpp b/Plugin/Source/Processors/Hysteresis/RTNeural/src/Json2RnnParser.cpp @@ -63,13 +63,13 @@ template <typename T> std::unique_ptr<Dense<T>> Json2RnnParser::createDense (size_t in_size, size_t out_size, var& weights) { auto dense = std::make_unique<Dense<T>> (in_size, out_size); - + // load kernel weights T** denseWeights; - denseWeights = new T* [out_size]; + denseWeights = new T*[out_size]; for (size_t i = 0; i < out_size; ++i) denseWeights[i] = new T[in_size]; - + auto layerWeights = weights.getArray()->getUnchecked (0); for (int i = 0; i < layerWeights.getArray()->size(); ++i) { @@ -102,10 +102,10 @@ std::unique_ptr<GRULayer<T>> Json2RnnParser::createGRU (size_t in_size, size_t o // load kernel weights T** kernelWeights; - kernelWeights = new T* [in_size]; + kernelWeights = new T*[in_size]; for (size_t i = 0; i < in_size; ++i) - kernelWeights[i] = new T[3*out_size]; - + kernelWeights[i] = new T[3 * out_size]; + auto layerWeights = weights.getArray()->getUnchecked (0); for (int i = 0; i < layerWeights.getArray()->size(); ++i) { @@ -122,10 +122,10 @@ std::unique_ptr<GRULayer<T>> Json2RnnParser::createGRU (size_t in_size, size_t o // load recurrent weights T** recurrentWeights; - recurrentWeights = new T* [out_size]; + recurrentWeights = new T*[out_size]; for (size_t i = 0; i < out_size; ++i) - recurrentWeights[i] = new T[3*out_size]; - + recurrentWeights[i] = new T[3 * out_size]; + auto layerWeights2 = weights.getArray()->getUnchecked (1); for (int i = 0; i < layerWeights2.getArray()->size(); ++i) { @@ -142,10 +142,10 @@ std::unique_ptr<GRULayer<T>> Json2RnnParser::createGRU (size_t in_size, size_t o // load biases T** gruBias; - gruBias = new T* [2]; + gruBias = new T*[2]; for (size_t i = 0; i < 2; ++i) - gruBias[i] = new T[3*out_size]; - + gruBias[i] = new T[3 * out_size]; + auto layerBias = weights.getArray()->getUnchecked (2); for (int i = 0; i < layerBias.getArray()->size(); ++i) { diff --git a/Plugin/Source/Processors/Hysteresis/RTNeural/src/Json2RnnParser.h b/Plugin/Source/Processors/Hysteresis/RTNeural/src/Json2RnnParser.h @@ -1,8 +1,8 @@ #ifndef JSON2RNNPARSER_H_INCLUDED #define JSON2RNNPARSER_H_INCLUDED -#include <JuceHeader.h> #include "Model.h" +#include <JuceHeader.h> class Json2RnnParser { diff --git a/Plugin/Source/Processors/Hysteresis/RTNeural/src/Layer.h b/Plugin/Source/Processors/Hysteresis/RTNeural/src/Layer.h @@ -5,16 +5,15 @@ namespace MLUtils { - /** Neural network layer */ -template<typename T> +template <typename T> class Layer { public: - Layer (size_t in_size, size_t out_size) : - in_size (in_size), - out_size (out_size) - {} + Layer (size_t in_size, size_t out_size) : in_size (in_size), + out_size (out_size) + { + } virtual ~Layer() {} diff --git a/Plugin/Source/Processors/Hysteresis/RTNeural/src/Model.h b/Plugin/Source/Processors/Hysteresis/RTNeural/src/Model.h @@ -1,26 +1,25 @@ #ifndef MODEL_H_INCLUDED #define MODEL_H_INCLUDED -#include <vector> #include <iostream> +#include <vector> #include "Layer.h" #include "activation.h" #include "dense.h" -#include "gru.h" #include "gru.cpp" +#include "gru.h" namespace MLUtils { - /** Neural network model */ -template<typename T> +template <typename T> class Model { public: - Model (size_t in_size) : - in_size (in_size) - {} + Model (size_t in_size) : in_size (in_size) + { + } ~Model() { @@ -37,7 +36,7 @@ public: { if (layers.empty()) return in_size; - + return layers.back()->out_size; } @@ -62,7 +61,7 @@ public: for (size_t i = 1; i < layers.size(); ++i) { - layers[i]->forward (outs[i-1], outs[i]); + layers[i]->forward (outs[i - 1], outs[i]); } return outs.back()[0]; diff --git a/Plugin/Source/Processors/Hysteresis/RTNeural/src/activation.h b/Plugin/Source/Processors/Hysteresis/RTNeural/src/activation.h @@ -1,20 +1,19 @@ #ifndef ACTIVATION_H_INCLUDED #define ACTIVATION_H_INCLUDED -#include <functional> #include "Layer.h" +#include <functional> namespace MLUtils { - -template<typename T> +template <typename T> class Activation : public Layer<T> { public: - Activation (size_t size, std::function<T(T)> func) : - Layer<T> (size, size), - func (func) - {} + Activation (size_t size, std::function<T (T)> func) : Layer<T> (size, size), + func (func) + { + } virtual ~Activation() {} @@ -25,7 +24,7 @@ public: } private: - const std::function<T(T)> func; + const std::function<T (T)> func; }; } // namespace MLUtils @@ -35,13 +34,11 @@ private: namespace MLUtils { - -template<typename T> +template <typename T> class TanhActivation : public Activation<T> { public: - TanhActivation (size_t size) : - Activation<T> (size, {}) + TanhActivation (size_t size) : Activation<T> (size, {}) { inVec.resize (size, 1); outVec.resize (size, 1); @@ -66,14 +63,13 @@ public: namespace MLUtils { - -template<typename T> +template <typename T> class TanhActivation : public Activation<T> { public: - TanhActivation (size_t size) : - Activation<T> (size, [] (T x) { return std::tanh (x); }) - {} + TanhActivation (size_t size) : Activation<T> (size, [] (T x) { return std::tanh (x); }) + { + } inline void forward (const T* input, T* out) override { diff --git a/Plugin/Source/Processors/Hysteresis/RTNeural/src/dense.h b/Plugin/Source/Processors/Hysteresis/RTNeural/src/dense.h @@ -1,9 +1,9 @@ #ifndef DENSE_H_INCLUDED #define DENSE_H_INCLUDED -#include <vector> #include <algorithm> #include <numeric> +#include <vector> #ifdef USE_EIGEN #include "dense_eigen.h" @@ -12,13 +12,11 @@ namespace MLUtils { - -template<typename T> +template <typename T> class Dense1 { public: - Dense1 (size_t in_size) : - in_size (in_size) + Dense1 (size_t in_size) : in_size (in_size) { weights = new T[in_size]; } @@ -28,24 +26,26 @@ public: delete[] weights; } - inline T forward(const T* input) + inline T forward (const T* input) { - return std::inner_product(weights, weights + in_size, input, (T) 0) + bias; + return std::inner_product (weights, weights + in_size, input, (T) 0) + bias; } - void setWeights(const T* newWeights) + void setWeights (const T* newWeights) { for (size_t i = 0; i < in_size; ++i) weights[i] = newWeights[i]; } - void setBias(T b) { bias = b; } + void setBias (T b) { bias = b; } - T getWeight(size_t i) const noexcept { + T getWeight (size_t i) const noexcept + { return weights[i]; } - T getBias() const noexcept { + T getBias() const noexcept + { return bias; } @@ -56,12 +56,11 @@ private: T* weights; }; -template<typename T> +template <typename T> class Dense : public Layer<T> { public: - Dense (size_t in_size, size_t out_size) : - Layer<T> (in_size, out_size) + Dense (size_t in_size, size_t out_size) : Layer<T> (in_size, out_size) { subLayers = new Dense1<T>*[out_size]; for (size_t i = 0; i < out_size; ++i) @@ -82,30 +81,31 @@ public: out[i] = subLayers[i]->forward (input); } - void setWeights(const std::vector<std::vector<T>>& newWeights) + void setWeights (const std::vector<std::vector<T>>& newWeights) { for (size_t i = 0; i < Layer<T>::out_size; ++i) subLayers[i]->setWeights (newWeights[i].data()); } - void setWeights(T** newWeights) + void setWeights (T** newWeights) { for (size_t i = 0; i < Layer<T>::out_size; ++i) subLayers[i]->setWeights (newWeights[i]); } - void setBias(T* b) + void setBias (T* b) { for (size_t i = 0; i < Layer<T>::out_size; ++i) subLayers[i]->setBias (b[i]); } - T getWeight(size_t i, size_t k) const noexcept { - return subLayers[i]->getWeight(k); + T getWeight (size_t i, size_t k) const noexcept + { + return subLayers[i]->getWeight (k); } - - T getBias(size_t i) const noexcept { + T getBias (size_t i) const noexcept + { return subLayers[i]->getBias(); } diff --git a/Plugin/Source/Processors/Hysteresis/RTNeural/src/dense_eigen.h b/Plugin/Source/Processors/Hysteresis/RTNeural/src/dense_eigen.h @@ -1,18 +1,16 @@ #ifndef DENSEEIGEN_H_INCLUDED #define DENSEEIGEN_H_INCLUDED -#include <Eigen/Dense> #include "Layer.h" +#include <Eigen/Dense> namespace MLUtils { - -template<typename T> +template <typename T> class Dense : public Layer<T> { public: - Dense (size_t in_size, size_t out_size) : - Layer<T> (in_size, out_size) + Dense (size_t in_size, size_t out_size) : Layer<T> (in_size, out_size) { weights.resize (out_size, in_size); bias.resize (out_size, 1); @@ -31,32 +29,33 @@ public: std::copy (outVec.data(), outVec.data() + Layer<T>::out_size, out); } - void setWeights(const std::vector<std::vector<T>>& newWeights) + void setWeights (const std::vector<std::vector<T>>& newWeights) { for (size_t i = 0; i < Layer<T>::out_size; ++i) for (size_t k = 0; k < Layer<T>::in_size; ++k) weights (i, k) = newWeights[i][k]; } - void setWeights(T** newWeights) + void setWeights (T** newWeights) { for (size_t i = 0; i < Layer<T>::out_size; ++i) for (size_t k = 0; k < Layer<T>::in_size; ++k) weights (i, k) = newWeights[i][k]; } - void setBias(T* b) + void setBias (T* b) { for (size_t i = 0; i < Layer<T>::out_size; ++i) bias (i, 0) = b[i]; } - T getWeight(size_t i, size_t k) const noexcept { + T getWeight (size_t i, size_t k) const noexcept + { return weights (i, k); } - - T getBias(size_t i) const noexcept { + T getBias (size_t i) const noexcept + { return bias (i, 0); } diff --git a/Plugin/Source/Processors/Hysteresis/RTNeural/src/gru.cpp b/Plugin/Source/Processors/Hysteresis/RTNeural/src/gru.cpp @@ -2,14 +2,12 @@ namespace MLUtils { - #ifndef USE_EIGEN -template<typename T> -GRULayer<T>::GRULayer (size_t in_size, size_t out_size) : - Layer<T> (in_size, out_size), - zWeights (in_size, out_size), - rWeights (in_size, out_size), - cWeights (in_size, out_size) +template <typename T> +GRULayer<T>::GRULayer (size_t in_size, size_t out_size) : Layer<T> (in_size, out_size), + zWeights (in_size, out_size), + rWeights (in_size, out_size), + cWeights (in_size, out_size) { ht1 = new T[out_size]; zVec = new T[out_size]; @@ -17,7 +15,7 @@ GRULayer<T>::GRULayer (size_t in_size, size_t out_size) : cVec = new T[out_size]; } -template<typename T> +template <typename T> GRULayer<T>::~GRULayer() { delete[] ht1; @@ -26,9 +24,8 @@ GRULayer<T>::~GRULayer() delete[] cVec; } -template<typename T> -GRULayer<T>::WeightSet::WeightSet (size_t in_size, size_t out_size) : - out_size (out_size) +template <typename T> +GRULayer<T>::WeightSet::WeightSet (size_t in_size, size_t out_size) : out_size (out_size) { W = new T*[out_size]; U = new T*[out_size]; @@ -42,7 +39,7 @@ GRULayer<T>::WeightSet::WeightSet (size_t in_size, size_t out_size) : } } -template<typename T> +template <typename T> GRULayer<T>::WeightSet::~WeightSet() { delete[] b[0]; @@ -58,53 +55,53 @@ GRULayer<T>::WeightSet::~WeightSet() delete[] U; } -template<typename T> -void GRULayer<T>::setWVals(T** wVals) +template <typename T> +void GRULayer<T>::setWVals (T** wVals) { for (size_t i = 0; i < Layer<T>::in_size; ++i) { for (size_t k = 0; k < Layer<T>::out_size; ++k) { zWeights.W[k][i] = wVals[i][k]; - rWeights.W[k][i] = wVals[i][k+Layer<T>::out_size]; - cWeights.W[k][i] = wVals[i][k+Layer<T>::out_size*2]; + rWeights.W[k][i] = wVals[i][k + Layer<T>::out_size]; + cWeights.W[k][i] = wVals[i][k + Layer<T>::out_size * 2]; } } } -template<typename T> -void GRULayer<T>::setUVals(T** uVals) +template <typename T> +void GRULayer<T>::setUVals (T** uVals) { for (size_t i = 0; i < Layer<T>::out_size; ++i) { for (size_t k = 0; k < Layer<T>::out_size; ++k) { zWeights.U[k][i] = uVals[i][k]; - rWeights.U[k][i] = uVals[i][k+Layer<T>::out_size]; - cWeights.U[k][i] = uVals[i][k+Layer<T>::out_size*2]; + rWeights.U[k][i] = uVals[i][k + Layer<T>::out_size]; + cWeights.U[k][i] = uVals[i][k + Layer<T>::out_size * 2]; } } } -template<typename T> -void GRULayer<T>::setBVals(T** bVals) +template <typename T> +void GRULayer<T>::setBVals (T** bVals) { for (size_t i = 0; i < 2; ++i) { for (size_t k = 0; k < Layer<T>::out_size; ++k) { zWeights.b[i][k] = bVals[i][k]; - rWeights.b[i][k] = bVals[i][k+Layer<T>::out_size]; - cWeights.b[i][k] = bVals[i][k+Layer<T>::out_size*2]; + rWeights.b[i][k] = bVals[i][k + Layer<T>::out_size]; + cWeights.b[i][k] = bVals[i][k + Layer<T>::out_size * 2]; } } } -template<typename T> -T GRULayer<T>::getWVal(size_t i, size_t k) const noexcept +template <typename T> +T GRULayer<T>::getWVal (size_t i, size_t k) const noexcept { T** set = zWeights.W; - if(k > 2 * Layer<T>::out_size) + if (k > 2 * Layer<T>::out_size) { k -= 2 * Layer<T>::out_size; set = cWeights.W; @@ -118,11 +115,11 @@ T GRULayer<T>::getWVal(size_t i, size_t k) const noexcept return set[i][k]; } -template<typename T> -T GRULayer<T>::getUVal(size_t i, size_t k) const noexcept +template <typename T> +T GRULayer<T>::getUVal (size_t i, size_t k) const noexcept { T** set = zWeights.U; - if(k > 2 * Layer<T>::out_size) + if (k > 2 * Layer<T>::out_size) { k -= 2 * Layer<T>::out_size; set = cWeights.U; @@ -136,11 +133,11 @@ T GRULayer<T>::getUVal(size_t i, size_t k) const noexcept return set[i][k]; } -template<typename T> -T GRULayer<T>::getBVal(size_t i, size_t k) const noexcept +template <typename T> +T GRULayer<T>::getBVal (size_t i, size_t k) const noexcept { T** set = zWeights.b; - if(k > 2 * Layer<T>::out_size) + if (k > 2 * Layer<T>::out_size) { k -= 2 * Layer<T>::out_size; set = cWeights.b; diff --git a/Plugin/Source/Processors/Hysteresis/RTNeural/src/gru.h b/Plugin/Source/Processors/Hysteresis/RTNeural/src/gru.h @@ -2,20 +2,19 @@ #define GRU_H_INCLUDED #include <algorithm> -#include <numeric> #include <cmath> #include <cstring> +#include <numeric> #ifdef USE_EIGEN -#include "gru_eigen.h" #include "gru_eigen.cpp" +#include "gru_eigen.h" #else #include "Layer.h" namespace MLUtils { - -template<typename T> +template <typename T> class GRULayer : public Layer<T> { public: @@ -24,39 +23,39 @@ public: virtual void reset() { - std::fill(ht1, ht1 + Layer<T>::out_size, (T) 0); + std::fill (ht1, ht1 + Layer<T>::out_size, (T) 0); } - virtual inline void forward(const T* input, T* h) override + virtual inline void forward (const T* input, T* h) override { - for(size_t i = 0; i < Layer<T>::out_size; ++i) + for (size_t i = 0; i < Layer<T>::out_size; ++i) { - zVec[i] = sigmoid(vMult(zWeights.W[i], input, Layer<T>::in_size) + vMult(zWeights.U[i], ht1, Layer<T>::out_size) + zWeights.b[0][i] + zWeights.b[1][i]); - rVec[i] = sigmoid(vMult(rWeights.W[i], input, Layer<T>::in_size) + vMult(rWeights.U[i], ht1, Layer<T>::out_size) + rWeights.b[0][i] + rWeights.b[1][i]); - cVec[i] = std::tanh(vMult(cWeights.W[i], input, Layer<T>::in_size) + rVec[i] * (vMult(cWeights.U[i], ht1, Layer<T>::out_size) + cWeights.b[1][i]) + cWeights.b[0][i]); + zVec[i] = sigmoid (vMult (zWeights.W[i], input, Layer<T>::in_size) + vMult (zWeights.U[i], ht1, Layer<T>::out_size) + zWeights.b[0][i] + zWeights.b[1][i]); + rVec[i] = sigmoid (vMult (rWeights.W[i], input, Layer<T>::in_size) + vMult (rWeights.U[i], ht1, Layer<T>::out_size) + rWeights.b[0][i] + rWeights.b[1][i]); + cVec[i] = std::tanh (vMult (cWeights.W[i], input, Layer<T>::in_size) + rVec[i] * (vMult (cWeights.U[i], ht1, Layer<T>::out_size) + cWeights.b[1][i]) + cWeights.b[0][i]); h[i] = ((T) 1 - zVec[i]) * cVec[i] + zVec[i] * ht1[i]; } - - std::copy(h, h + Layer<T>::out_size, ht1); + + std::copy (h, h + Layer<T>::out_size, ht1); } - inline T vMult(const T* arg1, const T* arg2, size_t dim) + inline T vMult (const T* arg1, const T* arg2, size_t dim) { - return std::inner_product(arg1, arg1 + dim, arg2, (T) 0); + return std::inner_product (arg1, arg1 + dim, arg2, (T) 0); } - inline T sigmoid(T value) + inline T sigmoid (T value) { - return (T) 1 / ((T) 1 + std::exp(-value)); + return (T) 1 / ((T) 1 + std::exp (-value)); } - void setWVals(T** wVals); - void setUVals(T** uVals); - void setBVals(T** bVals); + void setWVals (T** wVals); + void setUVals (T** uVals); + void setBVals (T** bVals); - T getWVal(size_t i, size_t k) const noexcept; - T getUVal(size_t i, size_t k) const noexcept; - T getBVal(size_t i, size_t k) const noexcept; + T getWVal (size_t i, size_t k) const noexcept; + T getUVal (size_t i, size_t k) const noexcept; + T getBVal (size_t i, size_t k) const noexcept; protected: T* ht1; diff --git a/Plugin/Source/Processors/Hysteresis/RTNeural/src/gru_eigen.cpp b/Plugin/Source/Processors/Hysteresis/RTNeural/src/gru_eigen.cpp @@ -4,10 +4,8 @@ namespace MLUtils { - -template<typename T> -GRULayer<T>::GRULayer (size_t in_size, size_t out_size) : - Layer<T> (in_size, out_size) +template <typename T> +GRULayer<T>::GRULayer (size_t in_size, size_t out_size) : Layer<T> (in_size, out_size) { wVec_z.resize (out_size, in_size); wVec_r.resize (out_size, in_size); @@ -28,53 +26,53 @@ GRULayer<T>::GRULayer (size_t in_size, size_t out_size) : ones = Eigen::Matrix<T, Eigen::Dynamic, Eigen::Dynamic>::Ones (out_size, 1); } -template<typename T> -void GRULayer<T>::setWVals(T** wVals) +template <typename T> +void GRULayer<T>::setWVals (T** wVals) { for (size_t i = 0; i < Layer<T>::in_size; ++i) { for (size_t k = 0; k < Layer<T>::out_size; ++k) { wVec_z (k, i) = wVals[i][k]; - wVec_r (k, i) = wVals[i][k+Layer<T>::out_size]; - wVec_c (k, i) = wVals[i][k+Layer<T>::out_size*2]; + wVec_r (k, i) = wVals[i][k + Layer<T>::out_size]; + wVec_c (k, i) = wVals[i][k + Layer<T>::out_size * 2]; } } } -template<typename T> -void GRULayer<T>::setUVals(T** uVals) +template <typename T> +void GRULayer<T>::setUVals (T** uVals) { for (size_t i = 0; i < Layer<T>::out_size; ++i) { for (size_t k = 0; k < Layer<T>::out_size; ++k) { uVec_z (k, i) = uVals[i][k]; - uVec_r (k, i) = uVals[i][k+Layer<T>::out_size]; - uVec_c (k, i) = uVals[i][k+Layer<T>::out_size*2]; + uVec_r (k, i) = uVals[i][k + Layer<T>::out_size]; + uVec_c (k, i) = uVals[i][k + Layer<T>::out_size * 2]; } } } -template<typename T> -void GRULayer<T>::setBVals(T** bVals) +template <typename T> +void GRULayer<T>::setBVals (T** bVals) { for (size_t i = 0; i < 2; ++i) { for (size_t k = 0; k < Layer<T>::out_size; ++k) { bVec_z (k, i) = bVals[i][k]; - bVec_r (k, i) = bVals[i][k+Layer<T>::out_size]; - bVec_c (k, i) = bVals[i][k+Layer<T>::out_size*2]; + bVec_r (k, i) = bVals[i][k + Layer<T>::out_size]; + bVec_c (k, i) = bVals[i][k + Layer<T>::out_size * 2]; } } } -template<typename T> -T GRULayer<T>::getWVal(size_t i, size_t k) const noexcept +template <typename T> +T GRULayer<T>::getWVal (size_t i, size_t k) const noexcept { Eigen::Matrix<T, Eigen::Dynamic, Eigen::Dynamic> set = wVec_z; - if(k > 2 * Layer<T>::out_size) + if (k > 2 * Layer<T>::out_size) set = wVec_c; else if (k > Layer<T>::out_size) set = wVec_r; @@ -82,11 +80,11 @@ T GRULayer<T>::getWVal(size_t i, size_t k) const noexcept return set (k % Layer<T>::out_size, i); } -template<typename T> -T GRULayer<T>::getUVal(size_t i, size_t k) const noexcept +template <typename T> +T GRULayer<T>::getUVal (size_t i, size_t k) const noexcept { Eigen::Matrix<T, Eigen::Dynamic, Eigen::Dynamic> set = uVec_z; - if(k > 2 * Layer<T>::out_size) + if (k > 2 * Layer<T>::out_size) set = uVec_c; else if (k > Layer<T>::out_size) set = uVec_r; @@ -94,11 +92,11 @@ T GRULayer<T>::getUVal(size_t i, size_t k) const noexcept return set (k % Layer<T>::out_size, i); } -template<typename T> -T GRULayer<T>::getBVal(size_t i, size_t k) const noexcept +template <typename T> +T GRULayer<T>::getBVal (size_t i, size_t k) const noexcept { Eigen::Matrix<T, Eigen::Dynamic, 2> set = bVec_z; - if(k > 2 * Layer<T>::out_size) + if (k > 2 * Layer<T>::out_size) set = bVec_c; else if (k > Layer<T>::out_size) set = bVec_r; diff --git a/Plugin/Source/Processors/Hysteresis/RTNeural/src/gru_eigen.h b/Plugin/Source/Processors/Hysteresis/RTNeural/src/gru_eigen.h @@ -1,13 +1,12 @@ #ifndef GRUEIGEN_H_INCLUDED #define GRUEIGEN_H_INCLUDED -#include <Eigen/Dense> #include "Layer.h" +#include <Eigen/Dense> namespace MLUtils { - -template<typename T> +template <typename T> class GRULayer : public Layer<T> { public: @@ -16,10 +15,10 @@ public: void reset() { - std::fill(ht1.data(), ht1.data() + Layer<T>::out_size, (T) 0); + std::fill (ht1.data(), ht1.data() + Layer<T>::out_size, (T) 0); } - inline void forward(const T* input, T* h) override + inline void forward (const T* input, T* h) override { inVec = Eigen::Map<const Eigen::Matrix<T, Eigen::Dynamic, 1>> (input, Layer<T>::in_size, 1); @@ -27,10 +26,10 @@ public: rVec = wVec_r * inVec + uVec_r * ht1 + bVec_r.col (0) + bVec_r.col (1); sigmoid (zVec); sigmoid (rVec); - + cVec = wVec_c * inVec + rVec.cwiseProduct (uVec_c * ht1 + bVec_c.col (1)) + bVec_c.col (0); cVec = cVec.array().tanh(); - + ht1 = (ones - zVec).cwiseProduct (cVec) + zVec.cwiseProduct (ht1); std::copy (ht1.data(), ht1.data() + Layer<T>::out_size, h); } @@ -40,13 +39,13 @@ public: vector = (T) 1 / (((T) -1 * vector.array()).array().exp() + (T) 1); } - void setWVals(T** wVals); - void setUVals(T** uVals); - void setBVals(T** bVals); + void setWVals (T** wVals); + void setUVals (T** uVals); + void setBVals (T** bVals); - T getWVal(size_t i, size_t k) const noexcept; - T getUVal(size_t i, size_t k) const noexcept; - T getBVal(size_t i, size_t k) const noexcept; + T getWVal (size_t i, size_t k) const noexcept; + T getUVal (size_t i, size_t k) const noexcept; + T getBVal (size_t i, size_t k) const noexcept; private: Eigen::Matrix<T, Eigen::Dynamic, Eigen::Dynamic> wVec_z; diff --git a/Plugin/Source/Processors/Hysteresis/RTNeural/tests/dense.cpp b/Plugin/Source/Processors/Hysteresis/RTNeural/tests/dense.cpp @@ -1,7 +1,7 @@ -#include <iostream> -#include <fstream> -#include "model_loader.hpp" #include "load_csv.hpp" +#include "model_loader.hpp" +#include <fstream> +#include <iostream> using T = double; @@ -9,24 +9,24 @@ int main() { std::cout << "TESTING DENSE IMPLEMENTATION..." << std::endl; - std::ifstream jsonStream("models/dense.json", std::ifstream::binary); - auto model = json_parser::parseJson<T>(jsonStream); + std::ifstream jsonStream ("models/dense.json", std::ifstream::binary); + auto model = json_parser::parseJson<T> (jsonStream); - std::ifstream pythonX("test_data/dense_x_python.csv"); - auto xData = load_csv::loadFile<T>(pythonX); + std::ifstream pythonX ("test_data/dense_x_python.csv"); + auto xData = load_csv::loadFile<T> (pythonX); - std::ifstream pythonY("test_data/dense_y_python.csv"); - const auto yRefData = load_csv::loadFile<T>(pythonY); + std::ifstream pythonY ("test_data/dense_y_python.csv"); + const auto yRefData = load_csv::loadFile<T> (pythonY); std::vector<T> yData (xData.size(), (T) 0); - for(size_t n = 0; n < xData.size(); ++n) - yData[n] = model->forward(xData[n].data()); + for (size_t n = 0; n < xData.size(); ++n) + yData[n] = model->forward (xData[n].data()); constexpr T THRESH = 1.0e-6; // 2.0e-8; - for(size_t n = 0; n < xData.size(); ++n) + for (size_t n = 0; n < xData.size(); ++n) { - auto err = std::abs(yData[n] - yRefData[n][0]); - if(err > THRESH) + auto err = std::abs (yData[n] - yRefData[n][0]); + if (err > THRESH) { std::cout << "ERR: " << err << ", idx: " << n << std::endl; break; diff --git a/Plugin/Source/Processors/Hysteresis/ToneControl.cpp b/Plugin/Source/Processors/Hysteresis/ToneControl.cpp @@ -2,9 +2,9 @@ namespace { - constexpr double slewTime = 0.05; - constexpr float transFreq = 500.0f; -} +constexpr double slewTime = 0.05; +constexpr float transFreq = 500.0f; +} // namespace ToneStage::ToneStage() { @@ -22,8 +22,7 @@ void ToneStage::prepare (double sampleRate) for (int ch = 0; ch < 2; ++ch) { - auto resetSmoothValue = [sampleRate] (SmoothGain& value) - { + auto resetSmoothValue = [sampleRate] (SmoothGain& value) { value.reset (sampleRate, slewTime); value.setCurrentAndTargetValue (value.getTargetValue()); }; @@ -33,8 +32,7 @@ void ToneStage::prepare (double sampleRate) resetSmoothValue (tFreq[ch]); tone[ch].reset(); - tone[ch].calcCoefs (lowGain[ch].getTargetValue(), highGain[ch].getTargetValue(), - tFreq[ch].getTargetValue(), fs); + tone[ch].calcCoefs (lowGain[ch].getTargetValue(), highGain[ch].getTargetValue(), tFreq[ch].getTargetValue(), fs); } } @@ -74,7 +72,7 @@ void ToneStage::processBlock (AudioBuffer<float>& buffer) //=================================================== ToneControl::ToneControl (AudioProcessorValueTreeState& vts) { - bassParam = vts.getRawParameterValue ("h_bass"); + bassParam = vts.getRawParameterValue ("h_bass"); trebleParam = vts.getRawParameterValue ("h_treble"); tFreqParam = vts.getRawParameterValue ("h_tfreq"); onOffParam = vts.getRawParameterValue ("tone_onoff"); @@ -85,13 +83,16 @@ void ToneControl::createParameterLayout (std::vector<std::unique_ptr<RangedAudio NormalisableRange freqRange { 100.0f, 4000.0f }; freqRange.setSkewForCentre (transFreq); - params.push_back (std::make_unique<AudioParameterBool> ("tone_onoff", "On/Off", true)); - params.push_back (std::make_unique<AudioParameterFloat> ("h_bass", "Bass", -1.0f, 1.0f, 0.0f)); + params.push_back (std::make_unique<AudioParameterBool> ("tone_onoff", "On/Off", true)); + params.push_back (std::make_unique<AudioParameterFloat> ("h_bass", "Bass", -1.0f, 1.0f, 0.0f)); params.push_back (std::make_unique<AudioParameterFloat> ("h_treble", "Treble", -1.0f, 1.0f, 0.0f)); - params.push_back (std::make_unique<AudioParameterFloat> ("h_tfreq", "Frequency", freqRange, transFreq, - String(), AudioProcessorParameter::genericParameter, [=] (float val, int) { + params.push_back (std::make_unique<AudioParameterFloat> ("h_tfreq", "Frequency", freqRange, transFreq, String(), AudioProcessorParameter::genericParameter, [=] (float val, int) { String suffix = " Hz"; - if (val > 1000.0f) { val /= 1000.0f; suffix = " kHz"; } + if (val > 1000.0f) + { + val /= 1000.0f; + suffix = " kHz"; + } return String (val, 2, false) + suffix; })); } @@ -106,12 +107,12 @@ void ToneControl::processBlockIn (AudioBuffer<float>& buffer) { if (static_cast<bool> (onOffParam->load())) { - toneIn.setLowGain (dbScale * bassParam->load()); + toneIn.setLowGain (dbScale * bassParam->load()); toneIn.setHighGain (dbScale * trebleParam->load()); } else { - toneIn.setLowGain (0.0f); + toneIn.setLowGain (0.0f); toneIn.setHighGain (0.0f); } toneIn.setTransFreq (tFreqParam->load()); @@ -123,16 +124,15 @@ void ToneControl::processBlockOut (AudioBuffer<float>& buffer) { if (static_cast<bool> (onOffParam->load())) { - toneOut.setLowGain (-1.0f * dbScale * bassParam->load()); + toneOut.setLowGain (-1.0f * dbScale * bassParam->load()); toneOut.setHighGain (-1.0f * dbScale * trebleParam->load()); } else { - toneOut.setLowGain (0.0f); + toneOut.setLowGain (0.0f); toneOut.setHighGain (0.0f); } toneOut.setTransFreq (tFreqParam->load()); - + toneOut.processBlock (buffer); } - diff --git a/Plugin/Source/Processors/Hysteresis/ToneFilter.h b/Plugin/Source/Processors/Hysteresis/ToneFilter.h @@ -1,8 +1,8 @@ #ifndef TONEFILTER_H_INCLUDED #define TONEFILTER_H_INCLUDED -#include "../IIRFilter.h" #include "../BilinearUtils.h" +#include "../IIRFilter.h" /** A first order shelving filter, with a set gain at DC, * a set gain at high frequencies, and a transition frequency. @@ -23,13 +23,15 @@ public: // reduce to simple gain element if (lowGain == highGain) { - this->b[0] = lowGain; this->b[1] = 0.0f; - this->a[0] = 1.0f; this->a[1] = 0.0f; + this->b[0] = lowGain; + this->b[1] = 0.0f; + this->a[0] = 1.0f; + this->a[1] = 0.0f; return; } auto wc = MathConstants<float>::twoPi * fc; - auto p = std::sqrt (wc*wc * (highGain*highGain - lowGain*highGain) / (lowGain*highGain - lowGain*lowGain)); + auto p = std::sqrt (wc * wc * (highGain * highGain - lowGain * highGain) / (lowGain * highGain - lowGain * lowGain)); auto K = p / std::tan (p / (2.0f * fs)); float bs[2] { highGain / p, lowGain }; diff --git a/Plugin/Source/Processors/IIRFilter.h b/Plugin/Source/Processors/IIRFilter.h @@ -4,12 +4,11 @@ namespace chowdsp { - /** IIR filter of arbirtary order. * Uses Transposed Direct Form II: * https://ccrma.stanford.edu/~jos/fp/Transposed_Direct_Forms.html */ -template<int order, typename FloatType=float> +template <int order, typename FloatType = float> class IIRFilter { public: @@ -19,20 +18,20 @@ public: /** Reset filter state */ virtual void reset() { - std::fill (z, &z[order+1], 0.0f); + std::fill (z, &z[order + 1], 0.0f); } /** Set coefficients to new values */ - virtual void setCoefs (const FloatType (&newB)[order+1], const FloatType (&newA)[order+1]) + virtual void setCoefs (const FloatType (&newB)[order + 1], const FloatType (&newA)[order + 1]) { - std::copy (newB, &newB[order+1], b); - std::copy (newA, &newA[order+1], a); + std::copy (newB, &newB[order + 1], b); + std::copy (newA, &newA[order + 1], a); } /** Optimized processing call for first-order filter */ template <int N = order> - inline typename std::enable_if <N == 1, FloatType>::type - processSample (FloatType x) noexcept + inline typename std::enable_if<N == 1, FloatType>::type + processSample (FloatType x) noexcept { FloatType y = z[1] + x * b[0]; z[order] = x * b[order] - y * a[order]; @@ -41,8 +40,8 @@ public: /** Optimized processing call for second-order filter */ template <int N = order> - inline typename std::enable_if <N == 2, FloatType>::type - processSample (FloatType x) noexcept + inline typename std::enable_if<N == 2, FloatType>::type + processSample (FloatType x) noexcept { FloatType y = z[1] + x * b[0]; z[1] = z[2] + x * b[1] - y * a[1]; @@ -52,13 +51,13 @@ public: /** Optimized processing call for Nth-order filter */ template <int N = order> - inline typename std::enable_if <(N > 2), FloatType>::type - processSample (FloatType x) noexcept + inline typename std::enable_if<(N > 2), FloatType>::type + processSample (FloatType x) noexcept { FloatType y = z[1] + x * b[0]; for (int i = 1; i < order; ++i) - z[i] = z[i+1] + x * b[i] - y * a[i]; + z[i] = z[i + 1] + x * b[i] - y * a[i]; z[order] = x * b[order] - y * a[order]; @@ -73,12 +72,12 @@ public: } protected: - FloatType a[order+1]; - FloatType b[order+1]; - FloatType z[order+1]; + FloatType a[order + 1]; + FloatType b[order + 1]; + FloatType z[order + 1]; private: JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (IIRFilter) }; -} // chowdsp +} // namespace chowdsp diff --git a/Plugin/Source/Processors/Input_Filters/InputFilters.cpp b/Plugin/Source/Processors/Input_Filters/InputFilters.cpp @@ -2,16 +2,16 @@ namespace { - constexpr float minFreq = 20.0f; - constexpr float maxFreq = 22000.0f; -} +constexpr float minFreq = 20.0f; +constexpr float maxFreq = 22000.0f; +} // namespace InputFilters::InputFilters (AudioProcessorValueTreeState& vts) { - lowCutParam = vts.getRawParameterValue ("ifilt_low"); + lowCutParam = vts.getRawParameterValue ("ifilt_low"); highCutParam = vts.getRawParameterValue ("ifilt_high"); - makeupParam = vts.getRawParameterValue ("ifilt_makeup"); - onOffParam = vts.getRawParameterValue ("ifilt_onoff"); + makeupParam = vts.getRawParameterValue ("ifilt_makeup"); + onOffParam = vts.getRawParameterValue ("ifilt_onoff"); } void InputFilters::createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params) @@ -24,7 +24,11 @@ void InputFilters::createParameterLayout (std::vector<std::unique_ptr<RangedAudi auto freqToString = [] (float freq, int) -> String { String suffix = " Hz"; - if (freq > 1000.0f) { freq /= 1000.0f; suffix = " kHz"; } + if (freq > 1000.0f) + { + freq /= 1000.0f; + suffix = " kHz"; + } return String (freq, 2, false) + suffix; }; @@ -36,25 +40,23 @@ void InputFilters::createParameterLayout (std::vector<std::unique_ptr<RangedAudi return freq; }; - params.push_back (std::make_unique<AudioParameterFloat> ("ifilt_low", "Low Cut", lowFreqRange, - minFreq, String(), AudioProcessorParameter::genericParameter, freqToString, stringToFreq)); - params.push_back (std::make_unique<AudioParameterFloat> ("ifilt_high", "High Cut", highFreqRange, - maxFreq, String(), AudioProcessorParameter::genericParameter, freqToString, stringToFreq)); - params.push_back (std::make_unique<AudioParameterBool> ("ifilt_makeup", "Cut Makeup", false)); - params.push_back (std::make_unique<AudioParameterBool> ("ifilt_onoff", "On/Off", false)); + params.push_back (std::make_unique<AudioParameterFloat> ("ifilt_low", "Low Cut", lowFreqRange, minFreq, String(), AudioProcessorParameter::genericParameter, freqToString, stringToFreq)); + params.push_back (std::make_unique<AudioParameterFloat> ("ifilt_high", "High Cut", highFreqRange, maxFreq, String(), AudioProcessorParameter::genericParameter, freqToString, stringToFreq)); + params.push_back (std::make_unique<AudioParameterBool> ("ifilt_makeup", "Cut Makeup", false)); + params.push_back (std::make_unique<AudioParameterBool> ("ifilt_onoff", "On/Off", false)); } void InputFilters::prepareToPlay (double sampleRate, int samplesPerBlock) { fs = (float) sampleRate; dsp::ProcessSpec spec { sampleRate, (uint32) samplesPerBlock, 2 }; - lowCutFilter.prepare (spec); + lowCutFilter.prepare (spec); highCutFilter.prepare (spec); - makeupDelay.prepare (spec); + makeupDelay.prepare (spec); - lowCutBuffer .setSize (2, samplesPerBlock); + lowCutBuffer.setSize (2, samplesPerBlock); highCutBuffer.setSize (2, samplesPerBlock); - makeupBuffer .setSize (2, samplesPerBlock); + makeupBuffer.setSize (2, samplesPerBlock); bypass.prepare (samplesPerBlock, bypass.toBool (onOffParam)); makeupBypass.prepare (samplesPerBlock, bypass.toBool (onOffParam)); @@ -71,12 +73,12 @@ void InputFilters::processBlock (AudioBuffer<float>& buffer) for (int ch = 0; ch < buffer.getNumChannels(); ++ch) { auto* data = buffer.getWritePointer (ch); - auto* cutLowSignal = lowCutBuffer.getWritePointer (ch); + auto* cutLowSignal = lowCutBuffer.getWritePointer (ch); auto* cutHighSignal = highCutBuffer.getWritePointer (ch); for (int n = 0; n < buffer.getNumSamples(); ++n) { - lowCutFilter.processSample (ch, data[n], cutLowSignal[n], data[n]); + lowCutFilter.processSample (ch, data[n], cutLowSignal[n], data[n]); highCutFilter.processSample (ch, data[n], data[n], cutHighSignal[n]); } } @@ -99,10 +101,10 @@ void InputFilters::processBlockMakeup (AudioBuffer<float>& buffer) } // compile makeup signal - dsp::AudioBlock<float> lowCutBlock (lowCutBuffer); + dsp::AudioBlock<float> lowCutBlock (lowCutBuffer); dsp::AudioBlock<float> highCutBlock (highCutBuffer); - dsp::AudioBlock<float> makeupBlock (makeupBuffer); - + dsp::AudioBlock<float> makeupBlock (makeupBuffer); + makeupBlock.fill (0.0f); makeupBlock += lowCutBlock; makeupBlock += highCutBlock; diff --git a/Plugin/Source/Processors/Input_Filters/InputFilters.h b/Plugin/Source/Processors/Input_Filters/InputFilters.h @@ -1,8 +1,8 @@ #ifndef INPUTFILTERS_H_INCLUDED #define INPUTFILTERS_H_INCLUDED -#include "LinkwitzRileyFilter.h" #include "../BypassProcessor.h" +#include "LinkwitzRileyFilter.h" class InputFilters { @@ -17,10 +17,10 @@ public: void processBlockMakeup (AudioBuffer<float>& buffer); private: - std::atomic<float>* onOffParam = nullptr; - std::atomic<float>* lowCutParam = nullptr; + std::atomic<float>* onOffParam = nullptr; + std::atomic<float>* lowCutParam = nullptr; std::atomic<float>* highCutParam = nullptr; - std::atomic<float>* makeupParam = nullptr; + std::atomic<float>* makeupParam = nullptr; float fs = 44100.0f; LinkwitzRileyFilter<float, 2> lowCutFilter; @@ -35,4 +35,3 @@ private: }; #endif // !INPUTFILTERS_H_INCLUDED - diff --git a/Plugin/Source/Processors/Input_Filters/LinkwitzRileyFilter.h b/Plugin/Source/Processors/Input_Filters/LinkwitzRileyFilter.h @@ -43,7 +43,7 @@ public: /** Performs the filter operation on a single sample at a time, and returns both the low-pass and the high-pass outputs of the TPT structure. */ - inline void processSample (size_t ch, SampleType x, SampleType &outputLow, SampleType &outputHigh) noexcept + inline void processSample (size_t ch, SampleType x, SampleType& outputLow, SampleType& outputHigh) noexcept { auto yH = (x - (R2 + g) * state[ch][0] - state[ch][1]) * h; @@ -83,8 +83,8 @@ public: private: void update() { - g = (SampleType) std::tan (MathConstants<double>::pi * cutoffFrequency / sampleRate); - h = (SampleType) (1.0 / (1.0 + R2 * g + g * g)); + g = (SampleType) std::tan (MathConstants<double>::pi * cutoffFrequency / sampleRate); + h = (SampleType) (1.0 / (1.0 + R2 * g + g * g)); } SampleType g, h; diff --git a/Plugin/Source/Processors/Loss_Effects/FIRFilter.h b/Plugin/Source/Processors/Loss_Effects/FIRFilter.h @@ -8,8 +8,7 @@ class FIRFilter { public: - FIRFilter (int order) : - order (order) + FIRFilter (int order) : order (order) { h = new float[order]; z = new float[2 * order]; diff --git a/Plugin/Source/Processors/Loss_Effects/LossFilter.cpp b/Plugin/Source/Processors/Loss_Effects/LossFilter.cpp @@ -1,7 +1,6 @@ #include "LossFilter.h" -LossFilter::LossFilter (AudioProcessorValueTreeState& vts, int order) : - order (order) +LossFilter::LossFilter (AudioProcessorValueTreeState& vts, int order) : order (order) { speed = vts.getRawParameterValue ("speed"); spacing = vts.getRawParameterValue ("spacing"); @@ -37,21 +36,13 @@ void LossFilter::createParameterLayout (std::vector<std::unique_ptr<RangedAudioP NormalisableRange<float> gapRange (1.0f, 50.0f); gapRange.setSkewForCentre (10.0f); - params.push_back (std::make_unique<AudioParameterFloat> ("speed", "Speed [ips]", - speedRange, 30.0f, String(), AudioProcessorParameter::genericParameter, - [] (float value, int) { return String (value, 2); })); + params.push_back (std::make_unique<AudioParameterFloat> ("speed", "Speed [ips]", speedRange, 30.0f, String(), AudioProcessorParameter::genericParameter, [] (float value, int) { return String (value, 2); })); - params.push_back (std::make_unique<AudioParameterFloat> ("spacing", "Spacing [microns]", - spaceRange, minDist, String(), AudioProcessorParameter::genericParameter, - valueToString, stringToValue)); + params.push_back (std::make_unique<AudioParameterFloat> ("spacing", "Spacing [microns]", spaceRange, minDist, String(), AudioProcessorParameter::genericParameter, valueToString, stringToValue)); - params.push_back (std::make_unique<AudioParameterFloat> ("thick", "Thickness [microns]", - thickRange, minDist, String(), AudioProcessorParameter::genericParameter, - valueToString, stringToValue)); + params.push_back (std::make_unique<AudioParameterFloat> ("thick", "Thickness [microns]", thickRange, minDist, String(), AudioProcessorParameter::genericParameter, valueToString, stringToValue)); - params.push_back (std::make_unique<AudioParameterFloat> ("gap", "Gap [microns]", - gapRange, 1.0f, String(), AudioProcessorParameter::genericParameter, - valueToString, stringToValue)); + params.push_back (std::make_unique<AudioParameterFloat> ("gap", "Gap [microns]", gapRange, 1.0f, String(), AudioProcessorParameter::genericParameter, valueToString, stringToValue)); params.push_back (std::make_unique<AudioParameterBool> ("loss_onoff", "On/Off", true)); } @@ -59,7 +50,7 @@ void LossFilter::createParameterLayout (std::vector<std::unique_ptr<RangedAudioP float LossFilter::getLatencySamples() const noexcept { return onOff->load() == 1.0f ? (float) curOrder / 2.0f // on - : 0.0f; // off + : 0.0f; // off } void LossFilter::prepare (float sampleRate, int samplesPerBlock) @@ -84,7 +75,7 @@ void LossFilter::prepare (float sampleRate, int samplesPerBlock) filters[ch][0]->reset(); filters[ch][1]->reset(); - + filters[ch][0]->setCoefs (currentCoefs.getRawDataPointer()); filters[ch][1]->setCoefs (currentCoefs.getRawDataPointer()); } @@ -117,8 +108,8 @@ void LossFilter::calcCoefs (StereoIIR& filter) const auto kGapOverTwo = waveNumber * (*gap * (float) 1.0e-6) / 2.0f; H[k] = expf (-waveNumber * (*spacing * (float) 1.0e-6)); // Spacing loss - H[k] *= (1.0f - expf (-thickTimesK)) / thickTimesK; // Thickness loss - H[k] *= sinf (kGapOverTwo) / kGapOverTwo; // Gap loss + H[k] *= (1.0f - expf (-thickTimesK)) / thickTimesK; // Thickness loss + H[k] *= sinf (kGapOverTwo) / kGapOverTwo; // Gap loss H[curOrder - k - 1] = H[k]; } @@ -146,8 +137,7 @@ void LossFilter::processBlock (AudioBuffer<float>& buffer) if (! bypass.processBlockIn (buffer, bypass.toBool (onOff))) return; - if ((*speed != prevSpeed || *spacing != prevSpacing || - *thickness != prevThickness || *gap != prevGap) && fadeCount == 0) + if ((*speed != prevSpeed || *spacing != prevSpacing || *thickness != prevThickness || *gap != prevGap) && fadeCount == 0) { calcCoefs (bumpFilter[! activeFilter]); for (int ch = 0; ch < numChannels; ++ch) diff --git a/Plugin/Source/Processors/Loss_Effects/LossFilter.h b/Plugin/Source/Processors/Loss_Effects/LossFilter.h @@ -1,8 +1,8 @@ #ifndef LOSSFILTER_H_INCLUDED #define LOSSFILTER_H_INCLUDED -#include "FIRFilter.h" #include "../BypassProcessor.h" +#include "FIRFilter.h" class LossFilter { @@ -41,7 +41,7 @@ private: float prevGap; float fs = 44100.0f; - float fsFactor = 1.0f; + float fsFactor = 1.0f; float binWidth = fs / 100.0f; const int order; diff --git a/Plugin/Source/Processors/Timing_Effects/Flutter.cpp b/Plugin/Source/Processors/Timing_Effects/Flutter.cpp @@ -3,7 +3,7 @@ namespace { - constexpr float depthSlewMin = 0.001f; +constexpr float depthSlewMin = 0.001f; } Flutter::Flutter (AudioProcessorValueTreeState& vts) @@ -34,7 +34,7 @@ void Flutter::initialisePlots (foleys::MagicGUIState& magicState) void Flutter::createParameterLayout (std::vector<std::unique_ptr<RangedAudioParameter>>& params) { - params.push_back (std::make_unique<AudioParameterFloat> ("rate", "Rate", 0.0f, 1.0f, 0.3f)); + params.push_back (std::make_unique<AudioParameterFloat> ("rate", "Rate", 0.0f, 1.0f, 0.3f)); params.push_back (std::make_unique<AudioParameterFloat> ("depth", "Depth", 0.0f, 1.0f, 0.0f)); params.push_back (std::make_unique<AudioParameterFloat> ("wow_rate", "Rate", 0.0f, 1.0f, 0.25f)); @@ -66,11 +66,11 @@ void Flutter::prepareToPlay (double sampleRate, int samplesPerBlock) dcBlocker[ch].prepare (sampleRate, 15.0f); } - wowAmp = 1000.0f * 1000.0f / (float) sampleRate; - amp1 = -230.0f * 1000.0f / (float) sampleRate; - amp2 = -80.0f * 1000.0f / (float) sampleRate; - amp3 = -99.0f * 1000.0f / (float) sampleRate; - dcOffset = 350.0f * 1000.0f / (float) sampleRate; + wowAmp = 1000.0f * 1000.0f / (float) sampleRate; + amp1 = -230.0f * 1000.0f / (float) sampleRate; + amp2 = -80.0f * 1000.0f / (float) sampleRate; + amp3 = -99.0f * 1000.0f / (float) sampleRate; + dcOffset = 350.0f * 1000.0f / (float) sampleRate; isOff = true; dryBuffer.setSize (2, samplesPerBlock); @@ -106,8 +106,7 @@ void Flutter::processBlock (AudioBuffer<float>& buffer, MidiBuffer& /*midiMessag flutterBuffer.setSize (2, buffer.getNumSamples(), false, false, true); flutterBuffer.clear(); - bool shouldTurnOff = ! static_cast<bool> (flutterOnOff->load()) || - (depthSlewWow[0].getTargetValue() == depthSlewMin && depthSlewFlutter[0].getTargetValue() == depthSlewMin); + bool shouldTurnOff = ! static_cast<bool> (flutterOnOff->load()) || (depthSlewWow[0].getTargetValue() == depthSlewMin && depthSlewFlutter[0].getTargetValue() == depthSlewMin); if (! isOff && ! shouldTurnOff) // process normally { processWetBuffer (buffer); @@ -164,9 +163,9 @@ void Flutter::processWetBuffer (AudioBuffer<float>& buffer) auto wowLFO = depthSlewWow[ch].getNextValue() * wowAmp * cosf (wowPhase[ch]); auto flutterLFO = depthSlewFlutter[ch].getNextValue() - * (amp1 * cosf (phase1[ch] + phaseOff1) - + amp2 * cosf (phase2[ch] + phaseOff2) - + amp3 * cosf (phase3[ch] + phaseOff3)); + * (amp1 * cosf (phase1[ch] + phaseOff1) + + amp2 * cosf (phase2[ch] + phaseOff2) + + amp3 * cosf (phase3[ch] + phaseOff3)); auto newLength = (wowLFO + flutterLFO + dcOffset + depthSlewWow[ch].getCurrentValue() * wowAmp) * (float) fs / 1000.0f; newLength = jlimit (0.0f, (float) HISTORY_SIZE, newLength); diff --git a/Plugin/Source/Processors/Timing_Effects/Flutter.h b/Plugin/Source/Processors/Timing_Effects/Flutter.h @@ -1,8 +1,8 @@ #ifndef FLUTTER_H_INCLUDED #define FLUTTER_H_INCLUDED -#include "../JuceLibraryCode/JuceHeader.h" #include "../Hysteresis/DCBlocker.h" +#include <JuceHeader.h> class Flutter { @@ -20,11 +20,11 @@ public: private: std::atomic<float>* flutterOnOff = nullptr; - std::atomic<float>* flutterRate = nullptr; + std::atomic<float>* flutterRate = nullptr; std::atomic<float>* flutterDepth = nullptr; - std::atomic<float>* wowRate = nullptr; + std::atomic<float>* wowRate = nullptr; std::atomic<float>* wowDepth = nullptr; - + bool isOff = false; AudioBuffer<float> dryBuffer; @@ -53,7 +53,7 @@ private: SmoothedValue<float, ValueSmoothingTypes::Multiplicative> depthSlewFlutter[2]; AudioBuffer<float> wowBuffer, flutterBuffer; - foleys::MagicPlotSource* wowPlot = nullptr, *flutterPlot = nullptr; + foleys::MagicPlotSource *wowPlot = nullptr, *flutterPlot = nullptr; enum { diff --git a/Plugin/build_linux.sh b/Plugin/build_linux.sh @@ -1,26 +0,0 @@ -mkdir -p JuceLibraryCode -cp -f linux_utils/AppConfig.h.in JuceLibraryCode/ - -lv2uri="https://github.com/jatinchowdhury18/AnalogTapeModel" -sed "s/_lv2uri_pattern_/${lv2uri//\//\\/}/g" JuceLibraryCode/AppConfig.h.in >JuceLibraryCode/AppConfig.h -sed "s/_juce_target_/CHOWTapeModel/g" linux_utils/LV2.mak.in >LV2.mak - -# build Projucer -( - cd Juce/extras/Projucer/Builds/LinuxMakefile - make -) - -PJ=./Juce/extras/Projucer/Builds/LinuxMakefile/build/Projucer - -$PJ --set-global-search-path linux defaultJuceModulePath Juce/modules -$PJ --set-global-search-path linux vstLegacyPath Juce/VST2_SDK -$PJ --resave CHOWTapeModel.jucer -echo "include ../../LV2.mak" >> Builds/LinuxMakefile/Makefile - -( - cd Builds/LinuxMakefile - CONFIG=Release make LV2 VST3 Standalone -) - -rm LV2.mak diff --git a/Plugin/linux_utils/AppConfig.h.in b/Plugin/linux_utils/AppConfig.h.in @@ -1,7 +0,0 @@ -// [BEGIN_USER_CODE_SECTION] - #define JucePlugin_Build_LV2 1 - #define JucePlugin_LV2URI "_lv2uri_pattern_" - #define JucePlugin_MaxNumInputChannels 2 - #define JucePlugin_MaxNumOutputChannels 2 - -// [END_USER_CODE_SECTION] diff --git a/Plugin/linux_utils/LV2.mak.in b/Plugin/linux_utils/LV2.mak.in @@ -1,33 +0,0 @@ -# -*- makefile -*- -JUCE_TARGET := _juce_target_ -JUCE_TARGET_LV2 := $(JUCE_TARGET).so -JUCE_OUTDIR_LV2 := $(JUCE_OUTDIR)/$(JUCE_TARGET).lv2 -JUCE_CFLAGS_LV2 := $(JUCE_CFLAGS_VST) -JUCE_CPPFLAGS_LV2 := $(JUCE_CPPFLAGS_VST) -JUCE_LDFLAGS_LV2 := $(JUCE_LDFLAGS_VST) - -all : LV2 -LV2 : $(JUCE_OUTDIR_LV2)/$(JUCE_TARGET_LV2) - -OBJECTS_LV2 := \ - $(JUCE_OBJDIR)/include_juce_audio_plugin_client_LV2_.o - -$(JUCE_OBJDIR)/include_juce_audio_plugin_client_LV2_.o: ../../JuceLibraryCode/include_juce_audio_plugin_client_LV2.cpp - -$(V_AT)mkdir -p $(JUCE_OBJDIR) - @echo "Compiling include_juce_audio_plugin_client_LV2.cpp" - $(V_AT)$(CXX) $(JUCE_CXXFLAGS) $(JUCE_CPPFLAGS_LV2) $(JUCE_CFLAGS_LV2) -o "$@" -c "$<" - -$(JUCE_OUTDIR_LV2)/$(JUCE_TARGET_LV2) : check-pkg-config $(OBJECTS_LV2) $(RESOURCES) $(JUCE_OUTDIR)/$(JUCE_TARGET_SHARED_CODE) - @echo Linking "$(JUCE_TARGET) - LV2" - -$(V_AT)mkdir -p $(JUCE_BINDIR) - -$(V_AT)mkdir -p $(JUCE_LIBDIR) - -$(V_AT)mkdir -p $(JUCE_OUTDIR_LV2) - $(V_AT)$(CXX) -o $(JUCE_OUTDIR_LV2)/$(JUCE_TARGET_LV2) $(OBJECTS_LV2) $(JUCE_OUTDIR)/$(JUCE_TARGET_SHARED_CODE) $(JUCE_LDFLAGS) $(JUCE_LDFLAGS_LV2) $(RESOURCES) $(TARGET_ARCH) - python3 ../../linux_utils/generate-lv2-ttl.py $(JUCE_OUTDIR_LV2)/$(JUCE_TARGET_LV2) - --include $(OBJECTS_LV2:%.o=%.d) - -check-pkg-config: - @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } - @pkg-config --print-errors alsa freetype2 libcurl x11 xext xinerama - -\ No newline at end of file diff --git a/Plugin/linux_utils/generate-lv2-ttl.py b/Plugin/linux_utils/generate-lv2-ttl.py @@ -1,25 +0,0 @@ -#!/usr/bin/python3 - -# -# This python scripts invokes generates LV2 manifests. -# It does so by loading the plugin and invoking the adequate entry point inside -# the target directory. -# - -import os -import sys -import ctypes - -if len(sys.argv) != 2: - sys.stderr.write('Please indicate the path to the LV2 shared library.\n') - sys.exit(1) - -dll_path = sys.argv[1] -dll = ctypes.cdll.LoadLibrary(dll_path) - -dll_dir = os.path.dirname(dll_path) -dll_filename = os.path.basename(dll_path) -dll_basename = os.path.splitext(dll_filename)[0] - -os.chdir(dll_dir) -dll.lv2_generate_ttl(ctypes.c_char_p(dll_basename.encode('utf-8'))) diff --git a/README.md b/README.md @@ -45,6 +45,8 @@ please see the [building instructions](https://github.com/jatinchowdhury18/Analo Alternatively, Linux users may download builds from the [Open Build Service](https://build.opensuse.org/package/show/home:kill_it:JUCE/CHOWTapeModel). +**Note: If you have a computer with Applie Silicon, please try the [experimental build](https://github.com/jatinchowdhury18/AnalogTapeModel/tree/develop/Plugin/Bin)! Please note your experiences using the plugin on Apple Silicon in this [issue](https://github.com/jatinchowdhury18/AnalogTapeModel/issues/124).** + Note for FL Studio users: If you're experiencing pops and click while using the plugin, try enabling the "used fixed size buffers" setting. For more information, see this [issue](https://github.com/jatinchowdhury18/AnalogTapeModel/issues/17#issuecomment-640199581). diff --git a/mac_builds.sh b/mac_builds.sh @@ -1,15 +1,43 @@ #!/bin/bash -travis_run_before_install -travis_run_script +# exit on failure +set -e -cd $TRAVIS_BUILD_DIR/Plugin/Bin/Mac -rm -Rf CHOWTapeModel.* +# clean up old builds +cd Plugin +rm -Rf build/ +rm -Rf Bin/*Mac* -cp -Rf $TRAVIS_BUILD_DIR/Plugin/Builds/MacOSX/build/Release/CHOWTapeModel.app CHOWTapeModel.app -cp -Rf ~/Library/Audio/Plug-Ins/VST3/CHOWTapeModel.vst3 CHOWTapeModel.vst3 -cp -Rf ~/Library/Audio/Plug-Ins/VST/CHOWTapeModel.vst CHOWTapeModel.vst -cp -Rf ~/Library/Audio/Plug-Ins/Components/CHOWTapeModel.component CHOWTapeModel.component +# set up build VST +VST_PATH=~/Developer/VST2_SDK/ +sed -i '' "56s~.*~juce_set_vst2_sdk_path(${VST_PATH})~" CMakeLists.txt +sed -i '' '63s/#//' CMakeLists.txt -cd ../ -zip -r MacBuilds.zip Mac +# cmake new builds +TEAM_ID=$(more ~/Developer/mac_id) +cmake -Bbuild -GXcode -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY="Apple Distribution" \ + -DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM=$TEAM_ID \ + -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_STYLE="Manual" \ + -D"CMAKE_OSX_ARCHITECTURES=arm64;x86_64" +cmake --build build --config Release -j8 | xcpretty + +# copy builds to Bin +mkdir -p Bin/Mac +declare -a plugins=("CHOWTapeModel") +for plugin in "${plugins[@]}"; do + cp -R build/${plugin}_artefacts/Release/Standalone/${plugin}.app Bin/Mac/${plugin}.app + cp -R build/${plugin}_artefacts/Release/VST/${plugin}.vst Bin/Mac/${plugin}.vst + cp -R build/${plugin}_artefacts/Release/VST3/${plugin}.vst3 Bin/Mac/${plugin}.vst3 + cp -R build/${plugin}_artefacts/Release/AU/${plugin}.component Bin/Mac/${plugin}.component +done + +# reset CMakeLists.txt +git restore CMakeLists.txt + +# zip builds +VERSION=$(cut -f 2 -d '=' <<< "$(grep 'CMAKE_PROJECT_VERSION:STATIC' build/CMakeCache.txt)") +( + cd bin + rm -f "CHOWTapeModel-Mac-${VERSION}.zip" + zip -r "CHOWTapeModel-Mac-${VERSION}.zip" Mac +) diff --git a/validate.sh b/validate.sh @@ -0,0 +1,51 @@ +#!/bin/bash + +# install functions +install_pluginval_linux() +{ + curl -L "https://github.com/Tracktion/pluginval/releases/download/latest_release/pluginval_Linux.zip" -o pluginval.zip + unzip pluginval > /dev/null + echo "./pluginval" +} + +install_pluginval_mac() +{ + curl -L "https://github.com/Tracktion/pluginval/releases/download/latest_release/pluginval_macOS.zip" -o pluginval.zip + unzip pluginval > /dev/null + echo "pluginval.app/Contents/MacOS/pluginval" +} + +install_pluginval_win() +{ + powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; Invoke-WebRequest https://github.com/Tracktion/pluginval/releases/download/latest_release/pluginval_Windows.zip -OutFile pluginval.zip" + powershell -Command "Expand-Archive pluginval.zip -DestinationPath ." + echo "./pluginval.exe" +} + +# install +if [[ "$OSTYPE" == "linux-gnu"* ]]; then + pluginval=$(install_pluginval_linux) + plugin="Plugin/build/CHOWTapeModel_artefacts/Release/VST3/CHOWTapeModel.vst3" +elif [[ "$OSTYPE" == "darwin"* ]]; then + pluginval=$(install_pluginval_mac) + plugin="Plugin/build/CHOWTapeModel_artefacts/VST3/CHOWTapeModel.vst3" +else + pluginval=$(install_pluginval_win) + plugin="Plugin/build/CHOWTapeModel_artefacts/Release/VST3/CHOWTapeModel.vst3" +fi + +echo "Pluginval installed at ${pluginval}" +echo "Validating ${plugin}" + +n_tries=0 +result=1 +until [ "$n_tries" -ge 4 ] || [ "$result" -eq 0 ] +do + $pluginval --strictness-level 8 --validate-in-process --validate $plugin + result=$? + n_tries=$((n_tries+1)) +done + +# clean up +rm -Rf pluginval* +exit $result diff --git a/win_builds.sh b/win_builds.sh @@ -1,20 +1,59 @@ #!/bin/sh -export PATH="/c/Program Files (x86)/Microsoft Visual Studio/2017/Community/MSBuild/15.0/Bin/":$PATH +cd Plugin -echo "Building 64-bit..." -cd Plugin/Builds/VisualStudio2017/ -MSBuild.exe -v:quiet -t:rebuild -p:Configuration=Release -p:Platform=x64 CHOWTapeModel.sln +build64(){ + cmake -Bbuild -G"Visual Studio 15 2017 Win64" + cmake --build build --config Release -j4 +} -echo "Building 32-bit..." -MSBuild.exe -v:quiet -t:rebuild -p:Configuration=Release32 -p:Platform=Win32 CHOWTapeModel.sln -cd ../../ +build32(){ + cmake -Bbuild32 -G"Visual Studio 15 2017" + cmake --build build32 --config Release -j4 +} -echo "Copying Files..." -cp Builds/VisualStudio2017/x64/Release/VST/CHOWTapeModel.dll Bin/Win64/ -cp Builds/VisualStudio2017/x64/Release/VST3/CHOWTapeModel.vst3 Bin/Win64/ -cp Builds/VisualStudio2017/x64/Release/Standalone\ Plugin/CHOWTapeModel.exe Bin/Win64/ +# exit on failure +set -e -cp Builds/VisualStudio2017/Win32/Release32/VST/CHOWTapeModel.dll Bin/Win32/ -cp Builds/VisualStudio2017/Win32/Release32/VST3/CHOWTapeModel.vst3 Bin/Win32/ -cp Builds/VisualStudio2017/Win32/Release32/Standalone\ Plugin/CHOWTapeModel.exe Bin/Win32/ +# clean up old builds +rm -Rf build/ +rm -Rf build32/ +rm -Rf Bin/*Win64* +rm -Rf Bin/*Win32* + +# set up VST and ASIO paths +sed -i -e "56s/#//" CMakeLists.txt +sed -i -e "57s/#//" CMakeLists.txt +sed -i -e '63s/#//' CMakeLists.txt + +# cmake new builds +build64 & +build32 & +wait + +# copy builds to bin +mkdir -p Bin/Win64 +mkdir -p Bin/Win32 +declare -a plugins=("CHOWTapeModel") +for plugin in "${plugins[@]}"; do + cp -R build/${plugin}_artefacts/Release/Standalone/${plugin}.exe Bin/Win64/${plugin}.exe + cp -R build/${plugin}_artefacts/Release/VST/${plugin}.dll Bin/Win64/${plugin}.dll + cp -R build/${plugin}_artefacts/Release/VST3/${plugin}.vst3 Bin/Win64/${plugin}.vst3 + + cp -R build32/${plugin}_artefacts/Release/Standalone/${plugin}.exe Bin/Win32/${plugin}.exe + cp -R build32/${plugin}_artefacts/Release/VST/${plugin}.dll Bin/Win32/${plugin}.dll + cp -R build32/${plugin}_artefacts/Release/VST3/${plugin}.vst3 Bin/Win32/${plugin}.vst3 +done + +# reset CMakeLists.txt +git restore CMakeLists.txt + +# zip builds +VERSION=$(cut -f 2 -d '=' <<< "$(grep 'CMAKE_PROJECT_VERSION:STATIC' build/CMakeCache.txt)") +( + cd bin + rm -f "CHOWTapeModel-Win64-${VERSION}.zip" + rm -f "CHOWTapeModel-Win32-${VERSION}.zip" + zip -r "CHOWTapeModel-Win64-${VERSION}.zip" Win64 + zip -r "CHOWTapeModel-Win32-${VERSION}.zip" Win32 +)
