More tweak changes

Chowdhury-DSP · Nov 22, 2024 · bd9001a · bd9001a
1 parent b19d0b9
commit bd9001a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/modules/dsp/chowdsp_eq/EQ/chowdsp_StandardEQParameters.cpp b/modules/dsp/chowdsp_eq/EQ/chowdsp_StandardEQParameters.cpp
@@ -12,8 +12,10 @@ StandardEQParameters<NumBands>::StandardEQParameters (ParamHolder* parent,
 {
     for (auto& bandParams : eqParams)
     {
-        bandParams.paramHolder.emplace (this,
-                                        format (*arena, "{} {}", bandParams.bandNamePrefix, bandParams.bandIndex + 1));
+        bandParams.paramHolder = new (arena->allocate<ParamHolder> (1)) ParamHolder {
+            this,
+            format (*arena, "{} {}", bandParams.bandNamePrefix, bandParams.bandIndex + 1),
+        };
         bandParams.paramHolder->add (bandParams.onOffParam,
                                      bandParams.typeParam,
                                      bandParams.freqParam,
@@ -23,6 +25,13 @@ StandardEQParameters<NumBands>::StandardEQParameters (ParamHolder* parent,
     }
 }
 
+template <size_t NumBands>
+StandardEQParameters<NumBands>::~StandardEQParameters()
+{
+    for (auto& bandParams : eqParams)
+        bandParams.paramHolder->~ParamHolder();
+}
+
 template <size_t NumBands>
 typename StandardEQParameters<NumBands>::Params StandardEQParameters<NumBands>::getEQParameters (const EQParameterHandles& paramHandles)
 {

diff --git a/modules/dsp/chowdsp_eq/EQ/chowdsp_StandardEQParameters.h b/modules/dsp/chowdsp_eq/EQ/chowdsp_StandardEQParameters.h
@@ -94,14 +94,15 @@ struct StandardEQParameters : ParamHolder
         };
 
         /** Internal use only! */
-        std::optional<ParamHolder> paramHolder { std::nullopt }; // @TODO: use pointer instead of optional?
+        ParamHolder* paramHolder {};
     };
 
     /** Set of parameter handles for the entire EQ. */
     using EQParameterHandles = std::array<EQBandParams, NumBands>;
 
     /** Constructor */
     explicit StandardEQParameters (ParamHolder* parent, EQParameterHandles&& paramHandles, std::string_view name = {});
+    ~StandardEQParameters();
 
     /** Parameter handles */
     EQParameterHandles eqParams;

diff --git a/modules/gui/chowdsp_gui/PluginComponents/chowdsp_ParametersView.cpp b/modules/gui/chowdsp_gui/PluginComponents/chowdsp_ParametersView.cpp
@@ -180,7 +180,7 @@ struct ParametersView::Pimpl
     Pimpl (ParamHolder& params, ParameterListeners& listeners)
         : groupItem (params, listeners)
     {
-        view.setIndentSize (5);
+        view.setIndentSize (12);
         const auto numIndents = getNumIndents (groupItem);
         const auto width = 400 + view.getIndentSize() * numIndents;
 

diff --git a/modules/plugin/chowdsp_plugin_state/Backend/chowdsp_ParamHolder.cpp b/modules/plugin/chowdsp_plugin_state/Backend/chowdsp_ParamHolder.cpp
@@ -127,7 +127,7 @@ std::enable_if_t<TypeTraits::IsIterable<ParamContainerType>, void>
 
 [[nodiscard]] inline int ParamHolder::count() const noexcept
 {
-    int count = static_cast<int> (things.count());
+    auto count = static_cast<int> (things.count());
     for (auto& thing : things)
     {
         if (thing.get_flags() == Holder)