From 34205630ad1ee1b12d35cdf21eb43ea74b6538e7 Mon Sep 17 00:00:00 2001 From: Alex Nadzharov Date: Mon, 17 May 2021 10:32:17 +0300 Subject: [PATCH] version 0.0.2 fix: audiounit manufacturer id changed fix: 192kHz issue fixed feat: optional VST2 build (-DWITH_VST2, requires SDK) --- .gitignore | 2 ++ modules/CloudSeedJUCE/CMakeLists.txt | 23 +++++++++++++------ modules/CloudSeedJUCE/src/InfoString.hpp | 2 +- modules/CloudSeedJUCE/src/PluginProcessor.cpp | 1 + .../CloudSeedNative/src/ModulatedAllpass.h | 4 +++- .../CloudSeedNative/src/ReverbController.h | 6 ++--- 6 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3b97d8d --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ + +CMakeLists.txt.user diff --git a/modules/CloudSeedJUCE/CMakeLists.txt b/modules/CloudSeedJUCE/CMakeLists.txt index af54b03..ca9a67a 100644 --- a/modules/CloudSeedJUCE/CMakeLists.txt +++ b/modules/CloudSeedJUCE/CMakeLists.txt @@ -1,13 +1,15 @@ cmake_minimum_required(VERSION 3.6) -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(CMAKE_OSX_DEPLOYMENT_TARGET 10.11) +set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9) set(CMAKE_OSX_SYSROOT /) set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY true) -set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos;-iphonesimulator") -set_property(GLOBAL PROPERTY XCODE_EMIT_EFFECTIVE_PLATFORM_NAME ON) +set(CMAKE_OSX_ARCHITECTURES=x86_64;i386;arm64) + +# set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos;-iphonesimulator") +# set_property(GLOBAL PROPERTY XCODE_EMIT_EFFECTIVE_PLATFORM_NAME ON) project(CloudSeedJUCE) @@ -43,8 +45,15 @@ set(CS_HEADER_DIRS add_subdirectory(../../third_party/JUCE "JUCE") +set(PLUGIN_FORMATS VST3 AU) + +if (WITH_VST2) +juce_set_vst2_sdk_path(../../../vst2/) +set(PLUGIN_FORMATS ${PLUGIN_FORMATS} VST) +endif() + juce_add_plugin(CloudSeedJUCE - VERSION 2.0.0 # Set this if the plugin version is different to the project version + VERSION 0.0.2 # Set this if the plugin version is different to the project version ICON_BIG ${CMAKE_CURRENT_SOURCE_DIR}/img/icon.png # ICON_* arguments specify a path to an image file to use as an icon for the Standalone ICON_SMALL ${CMAKE_CURRENT_SOURCE_DIR}/img/icon.png COMPANY_NAME "CloudSeed [JUCE]" # Specify the name of the plugin's author @@ -54,9 +63,9 @@ juce_add_plugin(CloudSeedJUCE IS_MIDI_EFFECT FALSE # Is this plugin a MIDI effect? EDITOR_WANTS_KEYBOARD_FOCUS TRUE # Does the editor need keyboard focus? COPY_PLUGIN_AFTER_BUILD TRUE # Should the plugin be installed to a default location after building? - PLUGIN_MANUFACTURER_CODE Andj # A four-character manufacturer id with at least one upper-case character + PLUGIN_MANUFACTURER_CODE Clsj # A four-character manufacturer id with at least one upper-case character PLUGIN_CODE Clsj # A unique four-character plugin id with at least one upper-case character - FORMATS Standalone VST3 AU # The formats to build. Other valid formats are: AAX Unity VST AU AUv3 // AU VST3 + FORMATS Standalone ${PLUGIN_FORMATS} # The formats to build. Other valid formats are: AAX Unity VST AU AUv3 // AU VST3 PRODUCT_NAME "CloudSeed [JUCE]") # The name of the final executable, which can differ from the target name juce_generate_juce_header(CloudSeedJUCE) diff --git a/modules/CloudSeedJUCE/src/InfoString.hpp b/modules/CloudSeedJUCE/src/InfoString.hpp index a69cfcb..6318cea 100644 --- a/modules/CloudSeedJUCE/src/InfoString.hpp +++ b/modules/CloudSeedJUCE/src/InfoString.hpp @@ -1,3 +1,3 @@ #pragma once -const auto infoString = "CloudSeed VST by Valdemar Eglingsson\nJUCE-based UI by Alex Nadzharov\nOriginal engine version: 1.0.1\nUI version: 0.0.1"; +const auto infoString = "CloudSeed VST by Valdemar Eglingsson\nJUCE-based UI by Alex Nadzharov\nOriginal engine version: 1.0.1\nUI version: 0.0.2"; diff --git a/modules/CloudSeedJUCE/src/PluginProcessor.cpp b/modules/CloudSeedJUCE/src/PluginProcessor.cpp index 07738f8..115f4ab 100644 --- a/modules/CloudSeedJUCE/src/PluginProcessor.cpp +++ b/modules/CloudSeedJUCE/src/PluginProcessor.cpp @@ -456,6 +456,7 @@ void CloudSeedProcessor::prepareToPlay(double sampleRate, int samplesPerBlock) auto count = getTotalNumInputChannels(); controller->SetSamplerate(sampleRate); + controller->SetChannelCount(count); ///> @todo validate buffer size /// there is currently a limitation in engine diff --git a/modules/CloudSeedNative/src/ModulatedAllpass.h b/modules/CloudSeedNative/src/ModulatedAllpass.h index a3e72de..146b8e4 100755 --- a/modules/CloudSeedNative/src/ModulatedAllpass.h +++ b/modules/CloudSeedNative/src/ModulatedAllpass.h @@ -62,8 +62,10 @@ namespace CloudSeed // added: for (int i=0;i