Skip to content

Commit

Permalink
Another CI/CD array check...
Browse files Browse the repository at this point in the history
  • Loading branch information
@nathanjhood
nathanjhood committed Mar 23, 2024
1 parent 136fd8f commit 96fdfdf
Show file tree
Hide file tree
Showing 9 changed files with 144 additions and 171 deletions.
4 changes: 2 additions & 2 deletions .vscode/c_cpp_properties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
{
"name": "GCC 11.4.0 x86_64-linux-gnu",
"includePath": [
"${workspaceFolder}/modules/**",
"${workspaceFolder}/Modules/**",
"${workspaceFolder}/JuceLibraryCode/**",
"${workspaceFolder}/include/**",
"${workspaceFolder}/Sources/**",
],
"defines": [],
"compilerPath": "/usr/bin/gcc",
Expand Down
15 changes: 15 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@ cmake_minimum_required (VERSION 3.22...3.29 FATAL_ERROR)

list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/share/cmake/Modules")

if (NOT DEFINED CMAKE_CONFIGURATION_TYPES)
set (CMAKE_CONFIGURATION_TYPES "")
list (APPEND CMAKE_CONFIGURATION_TYPES "Debug" "Release")
endif ()

if (NOT DEFINED CMAKE_BUILD_TYPE)
set (CMAKE_BUILD_TYPE "Debug")
endif ()

include (GetGitRevListCount)
get_git_rev_list_count ()

Expand Down Expand Up @@ -118,6 +127,12 @@ foreach (STONEYDSP_BIQUADS_UNIT_FILE IN LISTS STONEYDSP_BIQUADS_UNIT_FILES)
add_library (${STONEYDSP_BIQUADS_UNIT_FILE} INTERFACE)
add_library (StoneyDSP::Biquads::${STONEYDSP_BIQUADS_UNIT_FILE} ALIAS ${STONEYDSP_BIQUADS_UNIT_FILE})

# target_include_directories (${STONEYDSP_BIQUADS_UNIT_FILE}
# INTERFACE
# $<BUILD_INTERFACE:${STONEYDSP_BIQUADS_BINARY_DIR}/Biquads_Audio_Plugin_artefacts/Sources>
# $<INSTALL_INTERFACE:include/StoneyDSP/Biquads>
# )

if (CMAKE_MAJOR_VERSION GREATER_EQUAL 3 AND (CMAKE_MINOR_VERSION LESS 23))

target_include_directories (${STONEYDSP_BIQUADS_UNIT_FILE}
Expand Down
8 changes: 4 additions & 4 deletions Sources/Biquads.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ template struct Polar<double>;
/// @} group StoneyDSP
} // namespace StoneyDSP

#include "Parameters/Parameters.hpp"
#include "Wrapper/Wrapper.hpp"
#include "Processor/Processor.hpp"
#include "Editor/Editor.hpp"
// #include "Parameters/Parameters.hpp"
// #include "Wrapper/Wrapper.hpp"
// #include "Processor/Processor.hpp"
// #include "Editor/Editor.hpp"
34 changes: 17 additions & 17 deletions Sources/Editor/Editor.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,23 @@
#pragma once
#define STONEYDSP_BIQUADS_EDITOR_HPP_INCLUDED

#ifndef STONEYDSP_BIQUADS_HPP_INCLUDED
#include <juce_audio_basics/juce_audio_basics.h>
#include <juce_audio_devices/juce_audio_devices.h>
#include <juce_audio_formats/juce_audio_formats.h>
#include <juce_audio_plugin_client/juce_audio_plugin_client.h>
#include <juce_audio_processors/juce_audio_processors.h>
#include <juce_audio_utils/juce_audio_utils.h>
#include <juce_core/juce_core.h>
#include <juce_data_structures/juce_data_structures.h>
#include <juce_dsp/juce_dsp.h>
#include <juce_events/juce_events.h>
#include <juce_graphics/juce_graphics.h>
#include <juce_gui_basics/juce_gui_basics.h>
#include <juce_gui_extra/juce_gui_extra.h>
#endif

// #include <Biquads.hpp>
#include "../Biquads.hpp"

// #ifndef STONEYDSP_BIQUADS_HPP_INCLUDED
// #include <juce_audio_basics/juce_audio_basics.h>
// #include <juce_audio_devices/juce_audio_devices.h>
// #include <juce_audio_formats/juce_audio_formats.h>
// #include <juce_audio_plugin_client/juce_audio_plugin_client.h>
// #include <juce_audio_processors/juce_audio_processors.h>
// #include <juce_audio_utils/juce_audio_utils.h>
// #include <juce_core/juce_core.h>
// #include <juce_data_structures/juce_data_structures.h>
// #include <juce_dsp/juce_dsp.h>
// #include <juce_events/juce_events.h>
// #include <juce_graphics/juce_graphics.h>
// #include <juce_gui_basics/juce_gui_basics.h>
// #include <juce_gui_extra/juce_gui_extra.h>
// #endif

namespace StoneyDSP {
/** @addtogroup StoneyDSP @{ */
Expand Down
24 changes: 12 additions & 12 deletions Sources/Parameters/Parameters.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
#pragma once
#define STONEYDSP_BIQUADS_PARAMETERS_HPP_INCLUDED

#ifndef STONEYDSP_BIQUADS_HPP_INCLUDED
#include <juce_audio_basics/juce_audio_basics.h> // depends: juce_core
#include <juce_audio_processors/juce_audio_processors.h> // depends: juce_gui_extra, juce_audio_basics
#include <juce_core/juce_core.h> //
#include <juce_data_structures/juce_data_structures.h> // depends: juce_events
#include <juce_events/juce_events.h> // depends: juce_core
#include <juce_graphics/juce_graphics.h> // depends: juce_events
#include <juce_gui_basics/juce_gui_basics.h> // depends: juce_graphics, juce_data_structures
#include <juce_gui_extra/juce_gui_extra.h> // depends: juce_gui_basics
#endif // STONEYDSP_BIQUADS_HPP_INCLUDED

// #include <Biquads.hpp>
#include "../Biquads.hpp"

// #ifndef STONEYDSP_BIQUADS_HPP_INCLUDED
// #include <juce_audio_basics/juce_audio_basics.h> // depends: juce_core
// #include <juce_audio_processors/juce_audio_processors.h> // depends: juce_gui_extra, juce_audio_basics
// #include <juce_core/juce_core.h> //
// #include <juce_data_structures/juce_data_structures.h> // depends: juce_events
// #include <juce_events/juce_events.h> // depends: juce_core
// #include <juce_graphics/juce_graphics.h> // depends: juce_events
// #include <juce_gui_basics/juce_gui_basics.h> // depends: juce_graphics, juce_data_structures
// #include <juce_gui_extra/juce_gui_extra.h> // depends: juce_gui_basics
// #endif // STONEYDSP_BIQUADS_HPP_INCLUDED

namespace StoneyDSP {
/** @addtogroup StoneyDSP @{ */
Expand Down
34 changes: 17 additions & 17 deletions Sources/Processor/Processor.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,25 @@
#pragma once
#define STONEYDSP_BIQUADS_PROCESSOR_HPP_INCLUDED

#ifndef STONEYDSP_BIQUADS_HPP_INCLUDED
#include <juce_audio_basics/juce_audio_basics.h> // depends: juce_core
#include <juce_audio_formats/juce_audio_formats.h> // depends: juce_audio_basics
#include <juce_audio_processors/juce_audio_processors.h> // depends: juce_gui_extra, juce_audio_basics
#include <juce_core/juce_core.h> //
#include <juce_data_structures/juce_data_structures.h> // depends: juce_events
#include <juce_dsp/juce_dsp.h> // depends: juce_audio_formats
#include <juce_events/juce_events.h> // depends: juce_core
#include <juce_graphics/juce_graphics.h> // depends: juce_events
#include <juce_gui_basics/juce_gui_basics.h> // depends: juce_graphics, juce_data_structures
#include <juce_gui_extra/juce_gui_extra.h> // depends: juce_gui_basics
#include "../Biquads.hpp"
#include "../Parameters/Parameters.hpp"
#include "../Wrapper/Wrapper.hpp"

#include <stoneydsp_audio/stoneydsp_audio.h>
#include <stoneydsp_core/stoneydsp_core.h>
#endif // STONEYDSP_BIQUADS_HPP_INCLUDED
// #ifndef STONEYDSP_BIQUADS_HPP_INCLUDED
// #include <juce_audio_basics/juce_audio_basics.h> // depends: juce_core
// #include <juce_audio_formats/juce_audio_formats.h> // depends: juce_audio_basics
// #include <juce_audio_processors/juce_audio_processors.h> // depends: juce_gui_extra, juce_audio_basics
// #include <juce_core/juce_core.h> //
// #include <juce_data_structures/juce_data_structures.h> // depends: juce_events
// #include <juce_dsp/juce_dsp.h> // depends: juce_audio_formats
// #include <juce_events/juce_events.h> // depends: juce_core
// #include <juce_graphics/juce_graphics.h> // depends: juce_events
// #include <juce_gui_basics/juce_gui_basics.h> // depends: juce_graphics, juce_data_structures
// #include <juce_gui_extra/juce_gui_extra.h> // depends: juce_gui_basics

// #include <Biquads.hpp>
// #include <Parameters/Parameters.hpp>
// #include <Wrapper/Wrapper.hpp>
// #include <stoneydsp_audio/stoneydsp_audio.h>
// #include <stoneydsp_core/stoneydsp_core.h>
// #endif // STONEYDSP_BIQUADS_HPP_INCLUDED

// #include "Biquads.hpp"
// #include "Parameters.hpp"
Expand Down
148 changes: 53 additions & 95 deletions Sources/Wrapper/Wrapper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,54 +44,50 @@ AudioPluginAudioProcessorWrapper<SampleType>::AudioPluginAudioProcessorWrapper(A

, biquadArraySize(static_cast<std::size_t>(4)) // cannot ‘dynamic_cast’ this - target type is not pointer or reference...

, masterBypassPtr(static_cast <juce::AudioParameterBool*>(apvts.getParameter("Master_bypassID")))
, masterOutputPtr(static_cast <juce::AudioParameterFloat*>(apvts.getParameter("Master_outputID")))
, masterMixPtr(static_cast <juce::AudioParameterFloat*>(apvts.getParameter("Master_mixID")))
, masterOsPtr(static_cast <juce::AudioParameterChoice*>(apvts.getParameter("Master_osID")))
, masterTransformPtr(static_cast <juce::AudioParameterChoice*>(apvts.getParameter("Master_transformID")))
, masterBypassPtr(dynamic_cast <juce::AudioParameterBool*>(apvts.getParameter("Master_bypassID")))
, masterOutputPtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Master_outputID")))
, masterMixPtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Master_mixID")))
, masterOsPtr(dynamic_cast <juce::AudioParameterChoice*>(apvts.getParameter("Master_osID")))
, masterTransformPtr(dynamic_cast <juce::AudioParameterChoice*>(apvts.getParameter("Master_transformID")))

// , biquadsABypassPtr(dynamic_cast <juce::AudioParameterBool*>(apvts.getParameter("Band_A_bypassID")))
// , biquadsAFrequencyPtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_A_frequencyID")))
// , biquadsAResonancePtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_A_resonanceID")))
// , biquadsAGainPtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_A_gainID")))
// , biquadsATypePtr(dynamic_cast <juce::AudioParameterChoice*>(apvts.getParameter("Band_A_typeID")))

// , biquadsBBypassPtr(dynamic_cast <juce::AudioParameterBool*>(apvts.getParameter("Band_B_bypassID")))
// , biquadsBFrequencyPtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_B_frequencyID")))
// , biquadsBResonancePtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_B_resonanceID")))
// , biquadsBGainPtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_B_gainID")))
// , biquadsBTypePtr(dynamic_cast <juce::AudioParameterChoice*>(apvts.getParameter("Band_B_typeID")))

// , biquadsCBypassPtr(dynamic_cast <juce::AudioParameterBool*>(apvts.getParameter("Band_C_bypassID")))
// , biquadsCFrequencyPtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_C_frequencyID")))
// , biquadsCResonancePtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_C_resonanceID")))
// , biquadsCGainPtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_C_gainID")))
// , biquadsCTypePtr(dynamic_cast <juce::AudioParameterChoice*>(apvts.getParameter("Band_C_typeID")))

// , biquadsDBypassPtr(dynamic_cast <juce::AudioParameterBool*>(apvts.getParameter("Band_D_bypassID")))
// , biquadsDFrequencyPtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_D_frequencyID")))
// , biquadsDResonancePtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_D_resonanceID")))
// , biquadsDGainPtr(dynamic_cast <juce::AudioParameterFloat*>(apvts.getParameter("Band_D_gainID")))
// , biquadsDTypePtr(dynamic_cast <juce::AudioParameterChoice*>(apvts.getParameter("Band_D_typeID")))

, bypassState(dynamic_cast <juce::AudioParameterBool*>(apvts.getParameter("Master_bypassID")))

, bypassState(static_cast <juce::AudioParameterBool*>(apvts.getParameter("Master_bypassID")))
, biquadsBypassPtrArray()
, biquadsFrequencyPtrArray()
, biquadsResonancePtrArray()
, biquadsGainPtrArray()
, biquadsFilterTypePtrArray()
// , biquadsBypassPtrArray
// {
// dynamic_cast <bool*>(apvts.getParameter("Band_A_bypassID"))
// , dynamic_cast <bool*>(apvts.getParameter("Band_B_bypassID"))
// , dynamic_cast <bool*>(apvts.getParameter("Band_C_bypassID"))
// , dynamic_cast <bool*>(apvts.getParameter("Band_D_bypassID"))
// }
// , biquadsFrequencyPtrArray
// {
// dynamic_cast <SampleType*>(apvts.getParameter("Band_A_frequencyID"))
// , dynamic_cast <SampleType*>(apvts.getParameter("Band_B_frequencyID"))
// , dynamic_cast <SampleType*>(apvts.getParameter("Band_C_frequencyID"))
// , dynamic_cast <SampleType*>(apvts.getParameter("Band_D_frequencyID"))
// }
// , biquadsResonancePtrArray
// {
// dynamic_cast <SampleType*>(apvts.getParameter("Band_A_resonanceID"))
// , dynamic_cast <SampleType*>(apvts.getParameter("Band_B_resonanceID"))
// , dynamic_cast <SampleType*>(apvts.getParameter("Band_C_resonanceID"))
// , dynamic_cast <SampleType*>(apvts.getParameter("Band_D_resonanceID"))
// }
// , biquadsGainPtrArray
// {
// dynamic_cast <SampleType*>(apvts.getParameter("Band_A_gainID"))
// , dynamic_cast <SampleType*>(apvts.getParameter("Band_B_gainID"))
// , dynamic_cast <SampleType*>(apvts.getParameter("Band_C_gainID"))
// , dynamic_cast <SampleType*>(apvts.getParameter("Band_D_gainID"))
// }

{

masterBypassPtr = static_cast <juce::AudioParameterBool*> (apvts.getParameter("Master_bypassID"));
masterOutputPtr = static_cast <juce::AudioParameterFloat*> (apvts.getParameter("Master_outputID"));
masterMixPtr = static_cast <juce::AudioParameterFloat*> (apvts.getParameter("Master_mixID"));
masterOsPtr = static_cast <juce::AudioParameterChoice*>(apvts.getParameter("Master_osID"));
masterTransformPtr = static_cast <juce::AudioParameterChoice*>(apvts.getParameter("Master_transformID"));
masterBypassPtr = dynamic_cast <juce::AudioParameterBool*> (apvts.getParameter("Master_bypassID"));
masterOutputPtr = dynamic_cast <juce::AudioParameterFloat*> (apvts.getParameter("Master_outputID"));
masterMixPtr = dynamic_cast <juce::AudioParameterFloat*> (apvts.getParameter("Master_mixID"));
masterOsPtr = dynamic_cast <juce::AudioParameterChoice*>(apvts.getParameter("Master_osID"));
masterTransformPtr = dynamic_cast <juce::AudioParameterChoice*>(apvts.getParameter("Master_transformID"));

// biquadsABypassPtr = dynamic_cast <juce::AudioParameterBool*> (apvts.getParameter("Band_A_bypassID"));
// biquadsAFrequencyPtr = dynamic_cast <juce::AudioParameterFloat*> (apvts.getParameter("Band_A_frequencyID"));
Expand Down Expand Up @@ -119,45 +115,6 @@ AudioPluginAudioProcessorWrapper<SampleType>::AudioPluginAudioProcessorWrapper(A

bypassState = dynamic_cast <juce::AudioParameterBool*> (apvts.getParameter("Master_bypassID"));

// biquadsBypassPtrArray =
// {
// dynamic_cast <bool>(apvts.getParameter("Band_A_bypassID"))
// , dynamic_cast <bool>(apvts.getParameter("Band_B_bypassID"))
// , dynamic_cast <bool>(apvts.getParameter("Band_C_bypassID"))
// , dynamic_cast <bool>(apvts.getParameter("Band_D_bypassID"))
// };

// biquadsFrequencyPtrArray =
// {
// dynamic_cast <SampleType>(apvts.getParameter("Band_A_frequencyID"))
// , dynamic_cast <SampleType>(apvts.getParameter("Band_B_frequencyID"))
// , dynamic_cast <SampleType>(apvts.getParameter("Band_C_frequencyID"))
// , dynamic_cast <SampleType>(apvts.getParameter("Band_D_frequencyID"))
// };

// biquadsResonancePtrArray =
// {
// dynamic_cast <SampleType>(apvts.getParameter("Band_A_resonanceID"))
// , dynamic_cast <SampleType>(apvts.getParameter("Band_B_resonanceID"))
// , dynamic_cast <SampleType>(apvts.getParameter("Band_C_resonanceID"))
// , dynamic_cast <SampleType>(apvts.getParameter("Band_D_resonanceID"))
// };

// biquadsGainPtrArray =
// {
// dynamic_cast <SampleType>(apvts.getParameter("Band_A_gainID"))
// , dynamic_cast <SampleType>(apvts.getParameter("Band_B_gainID"))
// , dynamic_cast <SampleType>(apvts.getParameter("Band_C_gainID"))
// , dynamic_cast <SampleType>(apvts.getParameter("Band_D_gainID"))
// };
// biquadsFilterTypePtrArray =
// {
// dynamic_cast <SampleType>(apvts.getParameter("Band_A_typeID"))
// , dynamic_cast <SampleType>(apvts.getParameter("Band_A_typeID"))
// , dynamic_cast <SampleType>(apvts.getParameter("Band_A_typeID"))
// , dynamic_cast <SampleType>(apvts.getParameter("Band_A_typeID"))
// };

jassert(masterBypassPtr != nullptr);
jassert(masterOutputPtr != nullptr);
jassert(masterMixPtr != nullptr);
Expand Down Expand Up @@ -190,12 +147,6 @@ AudioPluginAudioProcessorWrapper<SampleType>::AudioPluginAudioProcessorWrapper(A

jassert(bypassState != nullptr);

// jassert(biquadsBypassPtrArray != nullptr);
// jassert(biquadsFrequencyPtrArray != nullptr);
// jassert(biquadsResonancePtrArray != nullptr);
// jassert(biquadsGainPtrArray != nullptr);
// jassert(biquadsFilterTypePtrArray != nullptr);

jassert(biquadArraySize != static_cast<std::size_t>(0));

// auto osFilter = juce::dsp::Oversampling<SampleType>::filterHalfBandFIREquiripple;
Expand Down Expand Up @@ -390,21 +341,28 @@ void AudioPluginAudioProcessorWrapper<SampleType>::update()
mixer->setWetMixProportion(static_cast <SampleType> (0.01f * masterMixPtr->get()));

for(auto& biquad : biquadArray)
{
biquad->setTransformType(static_cast<StoneyDSP::Audio::BiquadsBiLinearTransformationType> (masterTransformPtr->getIndex()));

for(auto& biquadsFrequencyPtr : biquadsFrequencyPtrArray)
biquad->setFrequency(static_cast<SampleType>(biquadsFrequencyPtr->get()));
for(std::size_t i = static_cast<std::size_t>(0); i < biquadArraySize; ++i)
{
biquadArray[i]->setFrequency(static_cast<SampleType>(biquadsFrequencyPtrArray[i]->get()));
biquadArray[i]->setResonance(static_cast<SampleType>(biquadsResonancePtrArray[i]->get()));
biquadArray[i]->setGain(static_cast<SampleType>(biquadsGainPtrArray[i]->get()));
biquadArray[i]->setFilterType(static_cast<StoneyDSP::Audio::BiquadsFilterType>(biquadsFilterTypePtrArray[i]->getIndex()));
}

// for(auto& biquadsFrequencyPtr : biquadsFrequencyPtrArray)
// biquad->setFrequency(static_cast<SampleType>(biquadsFrequencyPtr->get()));

for(auto& biquadsResonancePtr : biquadsResonancePtrArray)
biquad->setFrequency(static_cast<SampleType>(biquadsResonancePtr->get()));
// for(auto& biquadsResonancePtr : biquadsResonancePtrArray)
// biquad->setResonance(static_cast<SampleType>(biquadsResonancePtr->get()));

for(auto& biquadsGainPtr : biquadsGainPtrArray)
biquad->setGain(static_cast<SampleType>(biquadsGainPtr->get()));
// for(auto& biquadsGainPtr : biquadsGainPtrArray)
// biquad->setGain(static_cast<SampleType>(biquadsGainPtr->get()));

// for(auto& biquadsTypePtr : biquadsFilterTypePtrArray)
// biquad->setFilterType(static_cast<StoneyDSP::Audio::BiquadsFilterType>(biquadsTypePtr->getIndex()));

for(auto& biquadsTypePtr : biquadsFilterTypePtrArray)
biquad->setFilterType(static_cast<StoneyDSP::Audio::BiquadsFilterType>(biquadsTypePtr->getIndex()));
}

// biquadArray[0]->setFrequency (static_cast <SampleType> (biquadsAFrequencyPtr->get()));
// biquadArray[0]->setResonance (static_cast <SampleType> (biquadsAResonancePtr->get()));
Expand Down
Loading

0 comments on commit 96fdfdf

Please sign in to comment.