Skip to content

Commit acdc844

Browse files
committed
fix: adjust to dmt api changes
1 parent 7de9cc9 commit acdc844

4 files changed

Lines changed: 14 additions & 15 deletions

File tree

src/app/PluginEditor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ PluginEditor::PluginEditor(PluginProcessor& p)
1010
325,
1111
[&p](dmt::gui::window::Layout& layout) {
1212
layout.addPanel<dmt::gui::panel::OscilloscopePanel<float>>(
13-
0, 0, 1, 1, p.apvts, p.oscilloscopeBuffer);
13+
0, 0, 1, 1, p.oscilloscopeBuffer, p.apvts);
1414
})
1515
{
1616
}

src/app/PluginProcessor.cpp

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22
#include "ParameterLayout.h"
33
#include "PluginEditor.h"
44

5-
dmt::configuration::SettingsOverwride HEADER_TITLE_BUTTON_WIDTH_OVERRIDE{
6-
"Header.TitleButtonWidth",
7-
160.0f,
8-
};
5+
inline const dmt::configuration::SettingsOverrides
6+
HEADER_TITLE_BUTTON_WIDTH_OVERRIDE{ { "Header.TitleButtonWidth", 160.0f } };
97

108
//==============================================================================
119
PluginProcessor::PluginProcessor()
1210
: dmt::app::AbstractPluginProcessor(createParameterLayout,
13-
{ HEADER_TITLE_BUTTON_WIDTH_OVERRIDE },
14-
{})
11+
HEADER_TITLE_BUTTON_WIDTH_OVERRIDE)
1512
, oscilloscopeBuffer(2, 4096)
1613
{
1714
}

src/dmt/app/AbstractPluginProcessor.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ class AbstractPluginProcessor : public juce::AudioProcessor
1212
//==============================================================================
1313
AbstractPluginProcessor(
1414
std::function<juce::AudioProcessorValueTreeState::ParameterLayout()>
15-
createParameterLayout)
15+
createParameterLayout,
16+
dmt::configuration::SettingsOverrides overrides = {},
17+
dmt::configuration::SettingsReplacements replacements = {})
1618
: AudioProcessor(
1719
BusesProperties()
1820
#if !JucePlugin_IsMidiEffect
@@ -27,7 +29,7 @@ class AbstractPluginProcessor : public juce::AudioProcessor
2729
#if PERFETTO
2830
MelatoninPerfetto::get().beginSession();
2931
#endif
30-
properties.initialize();
32+
properties.initialize(overrides, replacements);
3133
}
3234

3335
//==============================================================================

src/dmt/configuration/Properties.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ namespace configuration {
4242
//==============================================================================
4343

4444
using SettingValue = dmt::configuration::Container::SettingValue;
45-
using SettingsOverwride = std::pair<String, SettingValue>;
46-
using SettingsOverrides = std::vector<SettingsOverwride>;
45+
using SettingsOverride = std::pair<String, SettingValue>;
46+
using SettingsOverrides = std::vector<SettingsOverride>;
4747
using SettingsReplacement = std::pair<SettingValue, SettingValue>;
4848
using SettingsReplacements = std::vector<SettingsReplacement>;
4949
//==============================================================================
@@ -66,7 +66,7 @@ class Properties
6666
/**
6767
* @brief Initialize the properties with options and settings.
6868
*/
69-
void initialize(SettingsOverrides _overwrites = {},
69+
void initialize(SettingsOverrides _overrides = {},
7070
SettingsReplacements _replacements = {}) noexcept
7171
{
7272
auto options = dmt::configuration::getOptions();
@@ -76,7 +76,7 @@ class Properties
7676
// Build fallback property set from defaults
7777
fallbackPropertySet = dmt::Settings::container.toPropertySet();
7878
// Apply overrides and replacements to fallback only
79-
applyOverrides(&fallbackPropertySet, _overwrites);
79+
applyOverrides(&fallbackPropertySet, _overrides);
8080
applyReplacements(&fallbackPropertySet, _replacements);
8181
settings->setFallbackPropertySet(&fallbackPropertySet);
8282

@@ -140,9 +140,9 @@ class Properties
140140

141141
protected:
142142
void applyOverrides(juce::PropertySet* settings,
143-
const SettingsOverrides& _overwrites)
143+
const SettingsOverrides& _overrides)
144144
{
145-
for (const auto& [key, value] : _overwrites) {
145+
for (const auto& [key, value] : _overrides) {
146146
if (std::holds_alternative<String>(value)) {
147147
settings->setValue(key, std::get<String>(value));
148148
} else if (std::holds_alternative<int>(value)) {

0 commit comments

Comments
 (0)