From 4026ebc8c94ed59f9b7636084aa4c0c7576fc253 Mon Sep 17 00:00:00 2001 From: StoneyDSP Date: Wed, 20 Mar 2024 08:35:33 +0100 Subject: [PATCH] Added some CMake presets for Linux... --- .vscode/settings.json | 20 +- CMakeLists.txt | 19 +- CMakePresets.json | 73 +++++ VERSION | 2 +- include/StoneyDSP/Biquads/Parameters.hpp | 2 + package.json | 29 +- share/cmake/Presets/CMakePresets.json | 132 ++++++++ .../Presets/Linux/LinuxCMakePresets.json | 282 ++++++++++++++++++ src/StoneyDSP/Biquads/Parameters.cpp | 81 +++-- 9 files changed, 587 insertions(+), 53 deletions(-) create mode 100644 CMakePresets.json create mode 100644 share/cmake/Presets/CMakePresets.json create mode 100644 share/cmake/Presets/Linux/LinuxCMakePresets.json diff --git a/.vscode/settings.json b/.vscode/settings.json index 986ebad..5380b85 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,10 +1,18 @@ { "editor.rulers": [80], + "C_Cpp.vcpkg.enabled": true, + "C_Cpp.autoAddFileAssociations": true, + "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools", + "cmake.configureOnEdit": false, "cmake.configureOnOpen": false, "cmake.automaticReconfigure": false, + "cmake.setBuildTypeOnMultiConfig": true, + "cmake.loadCompileCommands": true, + "cmake.useCMakePresets": "auto", + "cmake.cmakePath": "cmake", "cmake.sourceDirectory": "${workspaceFolder}", @@ -15,10 +23,10 @@ // "VCPKG_ROOT": "${workspaceFolder}/vcpkg", "VCPKG_MANIFEST_MODE": false, "VCPKG_PREFER_SYSTEM_INSTALLED_BINARIES": true, - // "CMAKE_TOOLCHAIN_FILE": "${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", - "CMAKE_MAKE_PROGRAM": "make", - "CMAKE_CONFIGURATION_TYPES": "Debug;Release", - "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_TOOLCHAIN_FILE": "~/vcpkg/scripts/buildsystems/vcpkg.cmake", + // "CMAKE_MAKE_PROGRAM": "make", + // "CMAKE_CONFIGURATION_TYPES": "Debug;Release", + // "CMAKE_BUILD_TYPE": "Debug", "CMAKE_C_COMPILER_LAUNCHER": "ccache", "CMAKE_CXX_COMPILER_LAUNCHER": "ccache", "STONEYDSP_BIQUADS_BUILD_TESTS": true @@ -113,10 +121,6 @@ } }, - "C_Cpp.vcpkg.enabled": true, - "C_Cpp.autoAddFileAssociations": true, - "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools", - "files.exclude": { "**/.git": true, "**/.svn": true, diff --git a/CMakeLists.txt b/CMakeLists.txt index 303fddc..e75c119 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,13 +56,13 @@ option (STONEYDSP_BIQUADS_USING_JUCE_RECOMMENDED_WARNING_FLAGS "Link with juce:: set (STONEYDSP_BIQUADS_TARGETS "") -#find_package (StoneyDSP CONFIG REQUIRED) - #[=============================================================================[ # target: StoneyDSP::stoneydsp_core # target: StoneyDSP::stoneydsp_audio #]=============================================================================] +# find_package (StoneyDSP CONFIG REQUIRED) + add_subdirectory(modules) set_directory_properties(PROPERTIES @@ -493,6 +493,21 @@ configure_package_config_file( # ) # endif () +install ( + DIRECTORY "${STONEYDSP_BIQUADS_BINARY_DIR}/bin" + DESTINATION "Builds" +) + +install ( + DIRECTORY "${STONEYDSP_BIQUADS_BINARY_DIR}/lib" + DESTINATION "Builds" +) + +install ( + DIRECTORY "${STONEYDSP_BIQUADS_BINARY_DIR}/share" + DESTINATION "Builds" +) + install ( DIRECTORY "${STONEYDSP_BIQUADS_BINARY_DIR}/Biquads_Audio_Plugin_artefacts" DESTINATION "Builds" diff --git a/CMakePresets.json b/CMakePresets.json new file mode 100644 index 0000000..e4a32c8 --- /dev/null +++ b/CMakePresets.json @@ -0,0 +1,73 @@ +{ + "version": 6, + "cmakeMinimumRequired": { + "major": 3, + "minor": 23, + "patch": 0 + }, + "include": [ + "./share/cmake/Presets/Linux/LinuxCMakePresets.json" + ], + "vendor": {}, + "configurePresets": [ + { + "name": "default", + "hidden": true, + "displayName": "Default Config", + "description": "Default build using Ninja generator", + "generator": "Ninja", + "binaryDir": "${sourceDir}/Builds", + "cacheVariables": { + "STONEYDSP_BIQUADS_BUILD_TESTS": { "type": "BOOL", "value": "OFF" } + } + }, + { + "name": "ninja-multi-config", + "hidden": true, + "inherits": "default", + "displayName": "Ninja Multi-Config", + "description": "Default build using Ninja Multi-Config generator", + "generator": "Ninja Multi-Config" + } + ], + "buildPresets": [ + { + "name": "default", + "displayName": "Default", + "verbose": false, + "description": "An empty preset that does not add any arguments", + "targets": [ + "all", + "install", + "clean", + "juce_vst3_helper", + "Biquads_Audio_Plugin_Dependencies", + "Biquads_Audio_Plugin_Library", + "Biquads_Audio_Plugin", + "Biquads_Audio_Plugin_Standalone", + "Biquads_Audio_Plugin_VST3", + "Biquads_Audio_Plugin_All" + ] + }, + { + "name": "verbose", + "displayName": "Verbose", + "description": "An verbose preset that does not add any arguments", + "verbose": true, + "inherits": "default" + } + ], + "testPresets": [ + { + "name": "default", + "configurePreset": "default", + "output": { + "outputOnFailure": true + }, + "execution": { + "noTestsAction": "error", + "stopOnFailure": true + } + } + ] +} diff --git a/VERSION b/VERSION index 0ca48a7..800f7d7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.3.155 +1.2.3.156 diff --git a/include/StoneyDSP/Biquads/Parameters.hpp b/include/StoneyDSP/Biquads/Parameters.hpp index 0458312..9f3b0f6 100644 --- a/include/StoneyDSP/Biquads/Parameters.hpp +++ b/include/StoneyDSP/Biquads/Parameters.hpp @@ -54,6 +54,8 @@ class AudioPluginAudioProcessorParameters */ static juce::AudioProcessorValueTreeState::ParameterLayout createParameterLayout(); + static juce::AudioProcessorParameterGroup createParameterGroup(); + //============================================================================== juce::UndoManager& getUndoManager() { return undoManager; } //============================================================================== diff --git a/package.json b/package.json index e69d133..e965a95 100644 --- a/package.json +++ b/package.json @@ -14,16 +14,27 @@ "readme": "https://github.com/nathanjhood/Biquads/README.md", "license": "GPL-3.0", "scripts": { - "configure": "cmake -S . -B ./build -DSTONEYDSP_BIQUADS_BUILD_TESTS:BOOL=TRUE -DCMAKE_INSTALL_PREFIX:PATH=./install -G Ninja", - "reconfigure": "cmake --fresh -S . -B ./build -DSTONEYDSP_BIQUADS_BUILD_TESTS:BOOL=TRUE -DCMAKE_INSTALL_PREFIX:PATH=./install -G Ninja", - "build": "cmake --build ./build", - "postbuild": "cmake --install ./build", - "ctest": "ctest --test-dir ./build --rerun-failed --output-on-failure --verbose", - "cpack": "cpack --config ./build/CPackSourceConfig.cmake -B ./install", - "cdist": "cpack --config ./build/CPackConfig.cmake -B ./install", - "sys:config": "cmake --fresh -S . -B ./build -DSTONEYDSP_BIQUADS_BUILD_TESTS:BOOL=TRUE -GNinja", - "sys:install": "cmake --build ./build && cmake --build ./build --target install" + "configure": "cmake -S . -B ./build -G Ninja", + "reconfigure": "cmake --fresh -S . -B ./build -G Ninja", + "build": "cmake --build ./build", + "postbuild": "cmake --install ./build", + "ctest": "ctest --test-dir ./build --rerun-failed --output-on-failure --verbose", + "cpack": "cpack --config ./build/CPackSourceConfig.cmake -B ./install", + "cdist": "cpack --config ./build/CPackConfig.cmake -B ./install", + "clean": "cmake --build ./build --target clean", + + "dbg:configure": "cmake -S . -B ./build -DCMAKE_BUILD_TYPE:STRING=Debug -G Ninja", + "dbg:reconfigure": "cmake --fresh -S . -B ./build --config Debug -G Ninja", + "dbg:build": "cmake --build ./build --config Debug", + "dbg:postbuild": "cmake --install ./build --config Debug --prefix ./install", + "dbg:clean": "cmake --build ./build --config Debug --target clean", + + "rel:configure": "cmake -S . -B ./build -DCMAKE_BUILD_TYPE:STRING=Release -G Ninja", + "rel:reconfigure": "cmake --fresh -S . -B ./build --config Debug -G Ninja", + "rel:build": "cmake --build ./build --config Release", + "rel:postbuild": "cmake --install ./build --config Release --prefix ./install", + "rel:clean": "cmake --build ./build --config Release --target clean" }, "engines": { "node": ">=16.8.0" diff --git a/share/cmake/Presets/CMakePresets.json b/share/cmake/Presets/CMakePresets.json new file mode 100644 index 0000000..8caffaf --- /dev/null +++ b/share/cmake/Presets/CMakePresets.json @@ -0,0 +1,132 @@ +{ + "version": 6, + "cmakeMinimumRequired": { + "major": 3, + "minor": 23, + "patch": 0 + }, + "include": [ + ], + "configurePresets": [ + { + "name": "default", + "hidden": true, + "displayName": "Default Config", + "description": "Default build using Ninja generator", + "generator": "Ninja", + "binaryDir": "${sourceDir}/Builds", + "cacheVariables": { + "FIRST_CACHE_VARIABLE": { + "type": "BOOL", + "value": "OFF" + }, + "SECOND_CACHE_VARIABLE": "ON" + }, + "environment": { + "MY_ENVIRONMENT_VARIABLE": "Test", + "PATH": "$env{HOME}/ninja/bin:$penv{PATH}" + }, + "vendor": { + "example.com/ExampleIDE/1.0": { + "autoFormat": true + } + } + }, + { + "name": "ninja-multi", + "inherits": "default", + "displayName": "Ninja Multi-Config", + "description": "Default build using Ninja Multi-Config generator", + "generator": "Ninja Multi-Config" + }, + { + "name": "windows-only", + "inherits": "default", + "displayName": "Windows-only configuration", + "description": "This build is only available on Windows", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + }, + { + "name": "linux-only", + "inherits": "default", + "displayName": "Linux-only configuration", + "description": "This build is only available on Linux", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Linux" + } + }, + { + "name": "darwin-only", + "inherits": "default", + "displayName": "Darwin-only configuration", + "description": "This build is only available on Darwin", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Darwin" + } + } + ], + "buildPresets": [ + { + "name": "default", + "configurePreset": "default" + } + ], + "testPresets": [ + { + "name": "default", + "configurePreset": "default", + "output": { + "outputOnFailure": true + }, + "execution": { + "noTestsAction": "error", + "stopOnFailure": true + } + } + ], + "packagePresets": [ + { + "name": "default", + "configurePreset": "default", + "generators": [ + "TGZ" + ] + } + ], + "workflowPresets": [ + { + "name": "default", + "steps": [ + { + "type": "configure", + "name": "default" + }, + { + "type": "build", + "name": "default" + }, + { + "type": "test", + "name": "default" + }, + { + "type": "package", + "name": "default" + } + ] + } + ], + "vendor": { + "example.com/ExampleIDE/1.0": { + "autoFormat": false + } + } +} diff --git a/share/cmake/Presets/Linux/LinuxCMakePresets.json b/share/cmake/Presets/Linux/LinuxCMakePresets.json new file mode 100644 index 0000000..1df78fa --- /dev/null +++ b/share/cmake/Presets/Linux/LinuxCMakePresets.json @@ -0,0 +1,282 @@ +{ + "version": 6, + "cmakeMinimumRequired": { + "major": 3, + "minor": 23, + "patch": 0 + }, + "include": [ + ], + "configurePresets": [ + { + "name": "linux-only", + "inherits": "default", + "hidden": true, + "displayName": "Linux-only configuration", + "description": "This build is only available on Linux", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Linux" + }, + "environment": { + "DISPLAY": ":0", + "VCPKG_DEFAULT_TRIPLET": "x64-linux", + "VCPKG_DEFAULT_HOST_TRIPLET": "x64-linux" + } + }, + { + "name": "linux-only-multi-config", + "hidden": true, + "inherits": "linux-only", + "displayName": "Ninja Multi-Config", + "description": "Default Linux build using Ninja Multi-Config generator", + "generator": "Ninja Multi-Config" + }, + + { + "name": "linux-ninja-multi-config", + "inherits": "linux-only-multi-config", + "displayName": "Ninja Multi-Config", + "description": "Default Linux Release build using Ninja Multi-Config generator", + "cacheVariables": { + "CMAKE_CONFIGURATION_TYPES": { + "type": "STRING", + "value": "Debug;Release" + } + } + }, + + { + "name": "unix-makefiles", + "hidden": true, + "inherits": "linux-only", + "displayName": "Unix Makefiles", + "description": "Default build using Unix Makefiles generator", + "generator": "Unix Makefiles", + "environment": {}, + "cacheVariables": { + "CMAKE_MAKE_PROGRAM": { + "type": "PATH", + "value": "make" + } + } + }, + + { + "name": "linux-make-debug", + "inherits": "unix-makefiles", + "displayName": "Make (Debug)", + "description": "Default Linux Debug build using Unix Makefiles generator", + "cacheVariables": { + "CMAKE_BUILD_TYPE": { + "type": "STRING", + "value": "Debug" + } + } + }, + { + "name": "linux-make-release", + "inherits": "unix-makefiles", + "displayName": "Make (Release)", + "description": "Default Linux Release build using Unix Makefiles generator", + "cacheVariables": { + "CMAKE_BUILD_TYPE": { + "type": "STRING", + "value": "Release" + } + } + }, + { + "name": "linux-ninja-debug", + "inherits": "linux-only", + "displayName": "Ninja (Debug)", + "description": "Default Linux Debug build using Ninja generator", + "cacheVariables": { + "CMAKE_BUILD_TYPE": { + "type": "STRING", + "value": "Debug" + } + } + }, + { + "name": "linux-ninja-release", + "inherits": "linux-only", + "displayName": "Ninja (Release)", + "description": "Default Linux Release build using Ninja generator", + "cacheVariables": { + "CMAKE_BUILD_TYPE": { + "type": "STRING", + "value": "Release" + } + } + } + ], + "buildPresets": [ + { + "displayName": "Linux", + "name": "linux-only", + "inherits": "default", + "configurePreset": "linux-only", + "verbose": false, + "hidden": true + }, + + { + "displayName": "Debug", + "inherits": "linux-only", + "configuration": "Debug", + "configurePreset": "linux-make-debug", + "name": "linux-make-debug" + }, + { + "displayName": "Debug (Verbose)", + "inherits": "linux-make-debug", + "name": "linux-make-debug-verbose", + "verbose": true + }, + { + "displayName": "Release", + "inherits": "linux-only", + "configuration": "Release", + "configurePreset": "linux-make-release", + "name": "linux-make-release" + }, + { + "displayName": "Release (Verbose)", + "inherits": "linux-make-release", + "name": "linux-make-release-verbose", + "verbose": true + }, + + { + "displayName": "Debug", + "inherits": "linux-only", + "configuration": "Debug", + "configurePreset": "linux-ninja-debug", + "name": "linux-ninja-debug" + }, + { + "displayName": "Debug (Verbose)", + "inherits": "linux-ninja-debug", + "name": "linux-ninja-debug-verbose", + "verbose": true + }, + { + "displayName": "Release", + "inherits": "linux-only", + "configuration": "Release", + "configurePreset": "linux-ninja-release", + "name": "linux-ninja-release" + }, + { + "displayName": "Release (Verbose)", + "inherits": "linux-ninja-release", + "name": "linux-ninja-release-verbose", + "verbose": true + }, + + + { + "displayName": "Debug", + "inherits": "linux-only", + "configuration": "Debug", + "configurePreset": "linux-ninja-multi-config", + "name": "linux-ninja-multi-config-debug" + }, + { + "displayName": "Release", + "inherits": "linux-only", + "configuration": "Release", + "configurePreset": "linux-ninja-multi-config", + "name": "linux-ninja-multi-config-release" + }, + { + "displayName": "Debug (Verbose)", + "inherits": "linux-ninja-multi-config-debug", + "name": "linux-ninja-multi-config-debug-verbose", + "verbose": true + }, + { + "displayName": "Release (Verbose)", + "inherits": "linux-ninja-multi-config-release", + "name": "linux-ninja-multi-config-release-verbose", + "verbose": true + } + ], + + "testPresets": [ + { + "displayName": "All", + "name": "linux-ninja-multi-config", + "configurePreset": "linux-ninja-multi-config", + "output": { + "outputOnFailure": true + }, + "execution": { + "noTestsAction": "error", + "stopOnFailure": true + } + }, + { + "displayName": "All", + "name": "linux-ninja-debug", + "configurePreset": "linux-ninja-debug", + "output": { + "outputOnFailure": true + }, + "execution": { + "noTestsAction": "error", + "stopOnFailure": true + } + }, + { + "displayName": "All", + "name": "linux-ninja-release", + "configurePreset": "linux-ninja-release", + "output": { + "outputOnFailure": true + }, + "execution": { + "noTestsAction": "error", + "stopOnFailure": true + } + }, + { + "displayName": "All", + "name": "linux-make-debug", + "configurePreset": "linux-make-debug", + "output": { + "outputOnFailure": true + }, + "execution": { + "noTestsAction": "error", + "stopOnFailure": true + } + }, + { + "displayName": "All", + "name": "linux-make-release", + "configurePreset": "linux-make-release", + "output": { + "outputOnFailure": true + }, + "execution": { + "noTestsAction": "error", + "stopOnFailure": true + } + } + ], + + "packagePresets": [ + { + "name": "default", + "configurePreset": "linux-only", + "generators": [ + "7Z", + "TGZ", + "ZIP" + ] + } + ] +} diff --git a/src/StoneyDSP/Biquads/Parameters.cpp b/src/StoneyDSP/Biquads/Parameters.cpp index 3535623..2c0f318 100644 --- a/src/StoneyDSP/Biquads/Parameters.cpp +++ b/src/StoneyDSP/Biquads/Parameters.cpp @@ -100,48 +100,56 @@ void AudioPluginAudioProcessorParameters::setParameterLayout(juce::AudioProcesso , std::make_unique (juce::ParameterID{ "Master_outputID", ProjectInfo::versionNumber}, "Output", outputRange, 00.00f, outputAttributes) , std::make_unique (juce::ParameterID{ "Master_mixID", ProjectInfo::versionNumber}, "Mix", mixRange, 100.00f, mixAttributes) , std::make_unique(juce::ParameterID{ "Master_osID", ProjectInfo::versionNumber}, "Oversampling", osString, 0) - , std::make_unique(juce::ParameterID{ "Master_transformID", ProjectInfo::versionNumber}, "Transform", tString, 3) + ), //============================================================================== - std::make_unique("Processor_ID", ProjectInfo::versionString, "seperatorProcessor", + std::make_unique("Processor_A_ID", ProjectInfo::versionString, "seperatorProcessorA", //============================================================================== - std::make_unique("Band_A_ID", "Band A", "seperatorA" + std::make_unique("Buss_A_ID", "Buss A", "seperatorBussA" //============================================================================== - , std::make_unique (juce::ParameterID{ "Band_A_bypassID", ProjectInfo::versionNumber}, "Bypass", false) - , std::make_unique (juce::ParameterID{ "Band_A_frequencyID", ProjectInfo::versionNumber}, "Frequency", freqRange, 632.455f, freqAttributes) - , std::make_unique (juce::ParameterID{ "Band_A_resonanceID", ProjectInfo::versionNumber}, "Resonance", resRange, 00.10f, resoAttributes) - , std::make_unique (juce::ParameterID{ "Band_A_gainID", ProjectInfo::versionNumber}, "Gain", gainRange, 00.00f, gainAttributes) - , std::make_unique(juce::ParameterID{ "Band_A_typeID", ProjectInfo::versionNumber}, "Type", fString, 12) + , std::make_unique(juce::ParameterID{ "Master_transformID", ProjectInfo::versionNumber}, "Transform", tString, 3) //============================================================================== - ), - //============================================================================== - std::make_unique("Band_B_ID", "Band B", "seperatorB" + , //============================================================================== - , std::make_unique (juce::ParameterID{ "Band_B_bypassID", ProjectInfo::versionNumber}, "Bypass", true) - , std::make_unique (juce::ParameterID{ "Band_B_frequencyID", ProjectInfo::versionNumber}, "Frequency", freqRange, 632.455f, freqAttributes) - , std::make_unique (juce::ParameterID{ "Band_B_resonanceID", ProjectInfo::versionNumber}, "Resonance", resRange, 00.10f, resoAttributes) - , std::make_unique (juce::ParameterID{ "Band_B_gainID", ProjectInfo::versionNumber}, "Gain", gainRange, 00.00f, gainAttributes) - , std::make_unique(juce::ParameterID{ "Band_B_typeID", ProjectInfo::versionNumber}, "Type", fString, 12) + std::make_unique("Band_A_ID", "Band A", "seperatorA" + //============================================================================== + , std::make_unique (juce::ParameterID{ "Band_A_bypassID", ProjectInfo::versionNumber}, "Bypass", false) + , std::make_unique (juce::ParameterID{ "Band_A_frequencyID", ProjectInfo::versionNumber}, "Frequency", freqRange, 632.455f, freqAttributes) + , std::make_unique (juce::ParameterID{ "Band_A_resonanceID", ProjectInfo::versionNumber}, "Resonance", resRange, 00.10f, resoAttributes) + , std::make_unique (juce::ParameterID{ "Band_A_gainID", ProjectInfo::versionNumber}, "Gain", gainRange, 00.00f, gainAttributes) + , std::make_unique(juce::ParameterID{ "Band_A_typeID", ProjectInfo::versionNumber}, "Type", fString, 12) + //============================================================================== + ), //============================================================================== - ), - //============================================================================== - std::make_unique("Band_C_ID", "Band C", "seperatorC" + std::make_unique("Band_B_ID", "Band B", "seperatorB" + //============================================================================== + , std::make_unique (juce::ParameterID{ "Band_B_bypassID", ProjectInfo::versionNumber}, "Bypass", true) + , std::make_unique (juce::ParameterID{ "Band_B_frequencyID", ProjectInfo::versionNumber}, "Frequency", freqRange, 632.455f, freqAttributes) + , std::make_unique (juce::ParameterID{ "Band_B_resonanceID", ProjectInfo::versionNumber}, "Resonance", resRange, 00.10f, resoAttributes) + , std::make_unique (juce::ParameterID{ "Band_B_gainID", ProjectInfo::versionNumber}, "Gain", gainRange, 00.00f, gainAttributes) + , std::make_unique(juce::ParameterID{ "Band_B_typeID", ProjectInfo::versionNumber}, "Type", fString, 12) + //============================================================================== + ), //============================================================================== - , std::make_unique (juce::ParameterID{ "Band_C_bypassID", ProjectInfo::versionNumber}, "Bypass", true) - , std::make_unique (juce::ParameterID{ "Band_C_frequencyID", ProjectInfo::versionNumber}, "Frequency", freqRange, 632.455f, freqAttributes) - , std::make_unique (juce::ParameterID{ "Band_C_resonanceID", ProjectInfo::versionNumber}, "Resonance", resRange, 00.10f, resoAttributes) - , std::make_unique (juce::ParameterID{ "Band_C_gainID", ProjectInfo::versionNumber}, "Gain", gainRange, 00.00f, gainAttributes) - , std::make_unique(juce::ParameterID{ "Band_C_typeID", ProjectInfo::versionNumber}, "Type", fString, 12) - //============================================================================== - ), - //============================================================================== - std::make_unique("Band_D_ID", "Band D", "seperatorD" + std::make_unique("Band_C_ID", "Band C", "seperatorC" + //============================================================================== + , std::make_unique (juce::ParameterID{ "Band_C_bypassID", ProjectInfo::versionNumber}, "Bypass", true) + , std::make_unique (juce::ParameterID{ "Band_C_frequencyID", ProjectInfo::versionNumber}, "Frequency", freqRange, 632.455f, freqAttributes) + , std::make_unique (juce::ParameterID{ "Band_C_resonanceID", ProjectInfo::versionNumber}, "Resonance", resRange, 00.10f, resoAttributes) + , std::make_unique (juce::ParameterID{ "Band_C_gainID", ProjectInfo::versionNumber}, "Gain", gainRange, 00.00f, gainAttributes) + , std::make_unique(juce::ParameterID{ "Band_C_typeID", ProjectInfo::versionNumber}, "Type", fString, 12) + //============================================================================== + ), //============================================================================== - , std::make_unique (juce::ParameterID{ "Band_D_bypassID", ProjectInfo::versionNumber}, "Bypass", true) - , std::make_unique (juce::ParameterID{ "Band_D_frequencyID", ProjectInfo::versionNumber}, "Frequency", freqRange, 632.455f, freqAttributes) - , std::make_unique (juce::ParameterID{ "Band_D_resonanceID", ProjectInfo::versionNumber}, "Resonance", resRange, 00.10f, resoAttributes) - , std::make_unique (juce::ParameterID{ "Band_D_gainID", ProjectInfo::versionNumber}, "Gain", gainRange, 00.00f, gainAttributes) - , std::make_unique(juce::ParameterID{ "Band_D_typeID", ProjectInfo::versionNumber}, "Type", fString, 12) + std::make_unique("Band_D_ID", "Band D", "seperatorD" + //============================================================================== + , std::make_unique (juce::ParameterID{ "Band_D_bypassID", ProjectInfo::versionNumber}, "Bypass", true) + , std::make_unique (juce::ParameterID{ "Band_D_frequencyID", ProjectInfo::versionNumber}, "Frequency", freqRange, 632.455f, freqAttributes) + , std::make_unique (juce::ParameterID{ "Band_D_resonanceID", ProjectInfo::versionNumber}, "Resonance", resRange, 00.10f, resoAttributes) + , std::make_unique (juce::ParameterID{ "Band_D_gainID", ProjectInfo::versionNumber}, "Gain", gainRange, 00.00f, gainAttributes) + , std::make_unique(juce::ParameterID{ "Band_D_typeID", ProjectInfo::versionNumber}, "Type", fString, 12) + //============================================================================== + ) //============================================================================== ) //============================================================================== @@ -160,6 +168,13 @@ juce::AudioProcessorValueTreeState::ParameterLayout AudioPluginAudioProcessorPar return parameterLayout; } + +juce::AudioProcessorParameterGroup AudioPluginAudioProcessorParameters::createParameterGroup() +{ + juce::AudioProcessorParameterGroup parameterGroup; + + return parameterGroup; +} //============================================================================== /// @} group Biquads } // namespace Biquads