Add multibus output option.

Author: Archie3d

.gitignore

@@ -1,3 +1,4 @@
+.vscode
 build
 Builds
 JuceLibraryCode

CMakeLists.txt

@@ -26,6 +26,8 @@ endif()
 
 option(WITH_ASIO "Enable ASIO audio interface" ON)
 
+option(WITH_MULTIBUS_OUTPUT "Enable multibus output" OFF)
+
 add_subdirectory(JUCE)
 
 set(plugin_formats
@@ -37,12 +39,25 @@ if(APPLE)
     list(APPEND plugin_formats AU)
 endif()
 
-juce_add_plugin(${PROJECT_NAME}
+if(WITH_MULTIBUS_OUTPUT)
+    set(TARGET "${PROJECT_NAME}-multibus")
+    set(PRODUCT_NAME "${PROJECT_NAME}-multibus")
+    set(PLUGIN_DESCRIPTION "${PRODUCT_NAME} multibus")
+    set(PLUGIN_CODE "E6hf")
+else()
+    set(TARGET "${PROJECT_NAME}")
+    set(PRODUCT_NAME "${PROJECT_NAME}")
+    set(PLUGIN_DESCRIPTION "${PRODUCT_NAME} stereo")
+    set(PLUGIN_CODE "E6he")
+endif()
+
+
+juce_add_plugin(${TARGET}
     VERSION "0.1.13"
     PLUGIN_MANUFACTURER_CODE "Arbe"
-    PLUGIN_CODE "E6he"
-    PLUGIN_DESCRIPTION "Aeolus"
-    PRODUCT_NAME "Aeolus"
+    PLUGIN_CODE ${PLUGIN_CODE}
+    PLUGIN_DESCRIPTION ${PLUGIN_DESCRIPTION}
+    PRODUCT_NAME ${PRODUCT_NAME}
     COMPANY_NAME "Arthur Benilov"
     IS_SYNTH TRUE
     IS_MIDI_EFFECT FALSE
@@ -52,7 +67,7 @@ juce_add_plugin(${PROJECT_NAME}
     ICON_SMALL "${CMAKE_CURRENT_SOURCE_DIR}/Resources/icons/icon64.png"
 )
 
-target_link_libraries(${PROJECT_NAME}
+target_link_libraries(${TARGET}
     PRIVATE
         juce::juce_core
         juce::juce_data_structures
@@ -65,9 +80,9 @@ target_link_libraries(${PROJECT_NAME}
         juce::juce_recommended_config_flags
 )
 
-juce_generate_juce_header(${PROJECT_NAME})
+juce_generate_juce_header(${TARGET})
 
-target_include_directories(${PROJECT_NAME}
+target_include_directories(${TARGET}
     PRIVATE
         "${CMAKE_CURRENT_SOURCE_DIR}/Source"
 )
@@ -79,12 +94,12 @@ file(GLOB_RECURSE src
 
 file(GLOB_RECURSE res "${CMAKE_CURRENT_SOURCE_DIR}/Resources/*.*")
 
-juce_add_binary_data(${PROJECT_NAME}_res SOURCES ${res})
-target_link_libraries(${PROJECT_NAME} PUBLIC ${PROJECT_NAME}_res)
+juce_add_binary_data(${TARGET}_res SOURCES ${res})
+target_link_libraries(${TARGET} PUBLIC ${TARGET}_res)
 
-target_sources(${PROJECT_NAME} PRIVATE ${src})
+target_sources(${TARGET} PRIVATE ${src})
 
-target_compile_definitions(${PROJECT_NAME}
+target_compile_definitions(${TARGET}
     PUBLIC
         JUCE_WEB_BROWSER=0
         JUCE_USE_CURL=0
@@ -93,17 +108,23 @@ target_compile_definitions(${PROJECT_NAME}
 )
 
 if(WITH_ASIO)
-    target_include_directories(${PROJECT_NAME}
+    target_include_directories(${TARGET}
         PRIVATE
             "${CMAKE_CURRENT_SOURCE_DIR}/asiosdk_2.3.3_2019-06-14/common"
     )
 
-    target_compile_definitions(${PROJECT_NAME} PUBLIC JUCE_ASIO=1)
+    target_compile_definitions(${TARGET} PUBLIC JUCE_ASIO=1)
+else()
+    target_compile_definitions(${TARGET} PUBLIC JUCE_ASIO=0)
+endif()
+
+if(WITH_MULTIBUS_OUTPUT)
+    target_compile_definitions(${TARGET} PUBLIC AEOLUS_MULTIBUS_OUTPUT=1)
 else()
-    target_compile_definitions(${PROJECT_NAME} PUBLIC JUCE_ASIO=0)
+    target_compile_definitions(${TARGET} PUBLIC AEOLUS_MULTIBUS_OUTPUT=0)
 endif()
 
 if(APPLE)
-    target_compile_definitions(${PROJECT_NAME} PUBLIC JUCE_AU=1)
-    target_compile_options(${PROJECT_NAME} PRIVATE "-mfma")
+    target_compile_definitions(${TARGET} PUBLIC JUCE_AU=1)
+    target_compile_options(${TARGET} PRIVATE "-mfma")
 endif()

README.md

@@ -1,7 +1,7 @@
 ![build](https://github.com/Archie3d/aeolus_plugin/actions/workflows/build.yml/badge.svg)
 
 # ![aeolus](Resources/icons/icon64.png) Aeolus
-Pipe organ emulator using additive synthesis as a VST plugin (or a stand-alone executable).
+Pipe organ emulator using additive synthesis as a **VST or AU plugin** (or a stand-alone executable).
 
 Aeolus was originally developed by Fons Adriaensen and presented in 2004. The original implementation is Linux only and can be found [here](https://kokkinizita.linuxaudio.org/linuxaudio/aeolus/) (or across Linux distribution packages). At present it looks like Aeolus development has been mostly abandoned (but [Organnery](https://organnery.com/) picked up the original Aeolus project to make it run on a Raspberry Pi).
 
@@ -16,7 +16,7 @@ The original binary format for the pipe models and the organ configuration has b
 
 ## Implementation notes
 
-This project takes only `addsynth` and `rankwave` modules from the original implementation. These modules describe the 64-harmonics additive synth and organ pipes wavetables generation. Plus this repo includes the original `ae0` files that contain the harmonics tables for various pipes in binary format (these are embedded into the plugin's resources). All the new pipe models are encoded in equivalent JSON format.
+This project takes only `addsynth` and `rankwave` modules from the original implementation (the source's been modified though). These modules describe the 64-harmonics additive synth and organ pipes wavetables generation. Plus this repo includes the original `ae0` files that contain the harmonics tables for various pipes in binary format (these are embedded into the plugin's resources). All the new pipe models are encoded in equivalent JSON format.
 
 The rest and the most of the code (including voicing, spatialisation, reverb, etc.) is all new, and it is not based on the original Aeolus, so the sound this plugin produces is different.
 
@@ -37,3 +37,18 @@ Custom organ configuration will be loaded by the plugin if found at `Documents/A
 > :point_right: The `Documents` folder's exact location depends on the operating system.
 
 To create the `organ_config.json` start with [default one embedded into the plugin](Resources/configs/default_organ.json) by copying it to `Documents/Aeolus` folder and renaming to `organ_config.json`.
+
+## Multibus output
+:warning: _Since version 0.1.13_
+
+When compiled with the `WITH_MULTIBUS_OUTPUT` CMake option enabled, the generated plugin will ouput to the `8` separate _monofonic_ buses. Each bus corresponds to the pipes groups placement in space according to the internal horizontal arrangement of the pipes.
+
+In multibus configuration there is no reverb applied, and there is no spatialization performed.
+
+> :point_right: The multibus mode is indended for the object based mixing, where you could place individual pipe groups in space yourself and apply a reverb of your preference.
+
+Pipes are arranged starting from the lowest key from the sides (buses 0 and 7) to the center in the middle of the range (buses 3, 4), and then going back from the centre towards the sides. For the pedal pipes, they go from the outside towards the centre only.
+
+Corresponding pipe position jumps between left and right following the keys (C will be on the left, C# on the right, D of the left, D# on the right and so on).
+
+> :point_right: This very same pipes spatial arrangement is used in the stereo version of the plugin to perform spatialized rendering followed by a stereo convolutional reverb.

Source/PluginEditor.cpp

@@ -75,6 +75,10 @@ AeolusAudioProcessorEditor::AeolusAudioProcessorEditor (AeolusAudioProcessor& p)
     _voiceCountValueLabel.setColour(Label::textColourId, Colours::lightyellow);
     addAndMakeVisible(_voiceCountValueLabel);
 
+#if !AEOLUS_MULTIBUS_OUTPUT
+
+    // Mutlibus configuration does not have a reverb
+
     addAndMakeVisible(_reverbLabel);
 
     addAndMakeVisible(_reverbComboBox);
@@ -98,6 +102,8 @@ AeolusAudioProcessorEditor::AeolusAudioProcessorEditor (AeolusAudioProcessor& p)
 
     addAndMakeVisible(_reverbSlider);
 
+#endif // !AEOLUS_MULTIBUS_OUTPUT
+
     _volumeLevelL.setSkew(0.5f);
     addAndMakeVisible(_volumeLevelL);
     _volumeLevelR.setSkew(0.5f);
@@ -233,11 +239,19 @@ void AeolusAudioProcessorEditor::resized()
     _voiceCountLabel.setBounds(150, margin, 56, 20);
     _voiceCountValueLabel.setBounds(_voiceCountLabel.getRight() + margin, margin, 30, 20);
 
+#if !AEOLUS_MULTIBUS_OUTPUT
     _reverbLabel.setBounds(_voiceCountValueLabel.getRight() + 40, margin, 60, 20);
     _reverbComboBox.setBounds(_reverbLabel.getRight() + margin, margin, 220, 20);
     _reverbSlider.setBounds(_reverbComboBox.getRight() + margin, margin, 100, 20);
 
     _volumeLabel.setBounds(_reverbSlider.getRight() + 40, margin, 60, 20);
+
+#else
+
+    _volumeLabel.setBounds(_voiceCountValueLabel.getRight() + 430, margin, 60, 20);
+
+#endif
+
     _volumeSlider.setBounds(_volumeLabel.getRight() + margin, margin, 100, 20);
 
     _volumeLevelL.setBounds(_volumeSlider.getX() + 5, _volumeSlider.getY() + 2, _volumeSlider.getWidth() - 10, 2);

Source/PluginProcessor.cpp

@@ -173,7 +173,7 @@ bool AeolusAudioProcessor::canApplyBusCountChange(bool isInput, bool isAdding, B
 #endif
 }
 
-bool AeolusAudioProcessor::isBusesLayoutSupported (const BusesLayout& layouts) const
+bool AeolusAudioProcessor::isBusesLayoutSupported(const BusesLayout& layouts) const
 {
     static_assert(!JucePlugin_IsMidiEffect, "This plugin is not a MIDI effect");
     static_assert(JucePlugin_IsSynth, "This plugin is a synthesizer");
@@ -207,7 +207,7 @@ void AeolusAudioProcessor::processorLayoutsChanged()
 
 #endif // JucePlugin_PreferredChannelConfigurations
 
-void AeolusAudioProcessor::processBlock (juce::AudioBuffer<float>& buffer, juce::MidiBuffer& midiMessages)
+void AeolusAudioProcessor::processBlock(juce::AudioBuffer<float>& buffer, juce::MidiBuffer& midiMessages)
 {
     using namespace std::chrono;
 
@@ -274,7 +274,7 @@ void AeolusAudioProcessor::processMidi(juce::MidiBuffer& midiMessages)
 
         if ((ch == 0 || _engine.getMIDIControlChannel() == 0 || ch == _engine.getMIDIControlChannel())
             && msg.isController()) {
-            
+
             int cc = msg.getControllerNumber();
             const float value = float(msg.getControllerValue()) / 127.0f;
 
@@ -306,7 +306,7 @@ juce::AudioProcessorEditor* AeolusAudioProcessor::createEditor()
 }
 
 //==============================================================================
-void AeolusAudioProcessor::getStateInformation (juce::MemoryBlock& destData)
+void AeolusAudioProcessor::getStateInformation(juce::MemoryBlock& destData)
 {
     auto state = _engine.getPersistentState();
 
@@ -318,7 +318,7 @@ void AeolusAudioProcessor::getStateInformation (juce::MemoryBlock& destData)
     JSON::writeToStream(stream, state);
 }
 
-void AeolusAudioProcessor::setStateInformation (const void* data, int sizeInBytes)
+void AeolusAudioProcessor::setStateInformation(const void* data, int sizeInBytes)
 {
     MemoryInputStream stream(data, sizeInBytes, false);
 

Source/aeolus/engine.cpp

@@ -498,9 +498,10 @@ void Engine::process(AudioBuffer<float>& out, bool isNonRealtime)
         while (_remainedSamples > 0 && _interpolator.canWrite()) {
             for (int ch = 0; ch < numChannels; ++ch)
                 _interpolator.writeUnchecked(_subFrameBuffer.getReadPointer(ch)[idx], (size_t) ch);
+
             _interpolator.writeIncrement();
 
-            --_remainedSamples;
+            _remainedSamples -= 1;
             idx += 1;
         }
 

Source/aeolus/engine.h

@@ -219,12 +219,12 @@ class Engine
     Level& getVolumeLevel() noexcept { return _volumeLevel; }
 
     /**
-     * Assign MIDI channel to be used to control the organ stops and sequencer.
+     * Returns currently set MIDI control channel.
      */
     int getMIDIControlChannel() const noexcept { return _midiControlChannel; }
 
     /**
-     * Returns currently set MIDI control channel.
+     * Assign MIDI channel to be used to control the organ stops and sequencer.
      */
     void setMIDIControlChannel(int c) noexcept { _midiControlChannel = c; }