From 8dca48de62269a5de7e0fb4173b3e2f79bdb14b2 Mon Sep 17 00:00:00 2001 From: Paul Date: Thu, 2 Jan 2025 10:56:08 -0500 Subject: [PATCH] Upgrade clap-wrapper and bblock; fix a few msvc warnings: (#59) --- libs/clap-libs/clap-wrapper | 2 +- libs/sst/sst-basic-blocks | 2 +- src/dsp/node_support.h | 2 +- src/dsp/op_source.h | 2 +- src/synth/synth.cpp | 2 +- src/synth/voice.cpp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/clap-libs/clap-wrapper b/libs/clap-libs/clap-wrapper index 705df27..710ba58 160000 --- a/libs/clap-libs/clap-wrapper +++ b/libs/clap-libs/clap-wrapper @@ -1 +1 @@ -Subproject commit 705df2703fbb991b3609e1a5c91d92a5c2213925 +Subproject commit 710ba58a256fa8456332eb5d76b6e68df89f73d7 diff --git a/libs/sst/sst-basic-blocks b/libs/sst/sst-basic-blocks index e299b11..bbcb841 160000 --- a/libs/sst/sst-basic-blocks +++ b/libs/sst/sst-basic-blocks @@ -1 +1 @@ -Subproject commit e299b11ee7e09c8d685026d333f54ebf6d20c052 +Subproject commit bbcb841b676ab59821fc7a381264d98705c7af5d diff --git a/src/dsp/node_support.h b/src/dsp/node_support.h index 37705ac..d59720d 100644 --- a/src/dsp/node_support.h +++ b/src/dsp/node_support.h @@ -292,7 +292,7 @@ template struct ModulationSupport [this](int i) { return ¶mBundle.moddepth[i].value; })) { std::fill(sourcePointers.begin(), sourcePointers.end(), nullptr); - std::fill(priorModulation.begin(), priorModulation.end(), 0); + std::fill(priorModulation.begin(), priorModulation.end(), 0.f); } void bindModulation() diff --git a/src/dsp/op_source.h b/src/dsp/op_source.h index e373d01..658a151 100644 --- a/src/dsp/op_source.h +++ b/src/dsp/op_source.h @@ -145,7 +145,7 @@ struct alignas(16) OpSource : public EnvelopeSupport, envProcess(); lfoProcess(); - auto lfoFac = lfoIsEnveloped > 0.5 ? env.outputCache[blockSize - 1] : 1.f; + auto lfoFac = lfoIsEnveloped ? env.outputCache[blockSize - 1] : 1.f; auto rf = monoValues.twoToTheX.twoToThe( ratio + envRatioAtten * envToRatio * env.outputCache[blockSize - 1] + diff --git a/src/synth/synth.cpp b/src/synth/synth.cpp index 1ba9550..78783f8 100644 --- a/src/synth/synth.cpp +++ b/src/synth/synth.cpp @@ -57,7 +57,7 @@ void Synth::setSampleRate(double sampleRate) lagHandler.setRate(60, blockSize, monoValues.sr.sampleRate); vuPeak.setSampleRate(monoValues.sr.sampleRate); - resampler = std::make_unique(monoValues.sr.sampleRate, realSampleRate); + resampler = std::make_unique((float)monoValues.sr.sampleRate, (float)realSampleRate); } void Synth::process(const clap_output_events_t *outq) diff --git a/src/synth/voice.cpp b/src/synth/voice.cpp index 2710735..0d3250d 100644 --- a/src/synth/voice.cpp +++ b/src/synth/voice.cpp @@ -43,7 +43,7 @@ Voice::Voice(const Patch &p, MonoValues &mv) })) { std::fill(isKeytrack.begin(), isKeytrack.end(), true); - std::fill(cmRatio.begin(), cmRatio.end(), 1.0); + std::fill(cmRatio.begin(), cmRatio.end(), 1.f); } void Voice::attack()