Fixes

Chowdhury-DSP · Dec 2, 2024 · fc0c577 · fc0c577
1 parent 4a4b5f5
commit fc0c577
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/examples/StatefulPlugin/PluginEditor.cpp b/examples/StatefulPlugin/PluginEditor.cpp
@@ -28,7 +28,7 @@ PluginEditor::PluginEditor (StatefulPlugin& plug) : juce::AudioProcessorEditor (
     const auto setSizeFromState = [this]
     {
         const auto& stateSize = plugin.getState().nonParams.editorBounds.get();
-        setSize (stateSize.x, stateSize.y);
+        setSize (stateSize.first, stateSize.second);
     };
     setSizeFromState();
 
@@ -65,5 +65,5 @@ void PluginEditor::resized()
     undoButton.setBounds (bounds.removeFromLeft (80));
     redoButton.setBounds (bounds.removeFromLeft (80));
 
-    plugin.getState().nonParams.editorBounds = getLocalBounds().getBottomRight();
+    plugin.getState().nonParams.editorBounds = std::make_pair (getLocalBounds().getRight(), getLocalBounds().getBottom());
 }
diff --git a/examples/StatefulPlugin/StatefulPlugin.h b/examples/StatefulPlugin/StatefulPlugin.h
@@ -34,7 +34,7 @@ struct PluginNonParameterState : chowdsp::NonParamState
         addStateValues ({ &editorBounds });
     }
 
-    chowdsp::StateValue<juce::Point<int>> editorBounds { "editor_bounds", { 300, 500 } };
+    chowdsp::StateValue<std::pair<int, int>> editorBounds { "editor_bounds", { 300, 500 } };
 };
 
 using State = chowdsp::PluginStateImpl<PluginParameterState, PluginNonParameterState>;

diff --git a/modules/plugin/chowdsp_plugin_state/Backend/chowdsp_NonParamState.cpp b/modules/plugin/chowdsp_plugin_state/Backend/chowdsp_NonParamState.cpp
@@ -85,7 +85,7 @@ void NonParamState::deserialize (nonstd::span<const std::byte> serial_data, NonP
         return nullptr;
     };
 
-    while (data.size() > 0)
+    while (! data.empty())
     {
         const auto value_name = deserialize_string (data);
         auto* value = get_value_ptr (value_name);

diff --git a/modules/plugin/chowdsp_plugin_state/Backend/chowdsp_ParamHolder.cpp b/modules/plugin/chowdsp_plugin_state/Backend/chowdsp_ParamHolder.cpp
@@ -280,7 +280,7 @@ inline void ParamHolder::getParameterPointers (ParamHolder& holder, ParamDeseria
                 break;
         }
 
-        parameters.insert (ParamDeserial { .id = paramID, .ptr = thing, .found = false });
+        parameters.insert (ParamDeserial { paramID, thing, false });
     }
 }
 
@@ -345,7 +345,7 @@ inline void ParamHolder::deserialize (nonstd::span<const std::byte>& serial_data
         return {};
     };
 
-    while (data.size() > 0)
+    while (! data.empty())
     {
         const auto param_id = deserialize_string (data);
         auto param_ptr = get_param_ptr (param_id);

diff --git a/tests/plugin_tests/chowdsp_presets_v2_test/PresetManagerTest.cpp b/tests/plugin_tests/chowdsp_presets_v2_test/PresetManagerTest.cpp
@@ -235,7 +235,7 @@ TEST_CASE ("Preset Manager Test", "[plugin][presets][state]")
         }
 
         ScopedPresetManager presetMgr {};
-        presetMgr.state.deserialize (state);
+        presetMgr.state.deserialize (std::move (state));
         REQUIRE_MESSAGE (juce::approximatelyEqual (presetMgr.getFloatParam(), otherValue), "Preset state is overriding parameter state!");
         REQUIRE (presetMgr->getCurrentPreset() == nullptr);
         REQUIRE (presetMgr->getIsPresetDirty());
@@ -261,7 +261,7 @@ TEST_CASE ("Preset Manager Test", "[plugin][presets][state]")
         }
 
         ScopedPresetManager presetMgr {};
-        presetMgr.state.deserialize (state);
+        presetMgr.state.deserialize (std::move (state));
         REQUIRE_MESSAGE (juce::approximatelyEqual (presetMgr.getFloatParam(), otherValue), "Preset state is overriding parameter state!");
         REQUIRE (*presetMgr->getCurrentPreset() == preset);
         REQUIRE (presetMgr->getIsPresetDirty());