feat: improve oscillator initialization values and LFO sync implementation with bar tracking
This commit is contained in:
parent
d8c1c90f15
commit
062d1e074c
3 changed files with 32 additions and 28 deletions
|
|
@ -22,8 +22,8 @@ public:
|
|||
};
|
||||
|
||||
SquidgeFilter()
|
||||
: Plugin(kParameterCount, 0, 0), filter_(1000.0f, 0.707f, 48000.0f),
|
||||
lfo_(4.0f) {
|
||||
: Plugin(kParameterCount, 0, 0), filter_(440.0f, 2.0f, 48000.0f),
|
||||
lfo_(20.0f), lfoSync_(0.0f) {
|
||||
filter_.setType(Filter::kLowPass);
|
||||
}
|
||||
|
||||
|
|
@ -43,16 +43,16 @@ protected:
|
|||
parameter.name = "Frequency";
|
||||
parameter.symbol = "frequency";
|
||||
parameter.ranges.min = 20.0f;
|
||||
parameter.ranges.def = 1000.0f;
|
||||
parameter.ranges.max = 20000.0f;
|
||||
parameter.ranges.def = 440.0f;
|
||||
parameter.ranges.max = 10000.0f;
|
||||
parameter.hints = kParameterIsAutomatable | kParameterIsLogarithmic;
|
||||
break;
|
||||
|
||||
case kParamResonance:
|
||||
parameter.name = "Resonance";
|
||||
parameter.symbol = "resonance";
|
||||
parameter.ranges.min = 0.1f;
|
||||
parameter.ranges.def = 0.707f;
|
||||
parameter.ranges.min = 0.9f;
|
||||
parameter.ranges.def = 2.0f;
|
||||
parameter.ranges.max = 20.0f;
|
||||
parameter.hints = kParameterIsAutomatable;
|
||||
break;
|
||||
|
|
@ -149,31 +149,25 @@ protected:
|
|||
const TimePosition &timePos = getTimePosition();
|
||||
|
||||
float targetFreq = 4.0f;
|
||||
int syncIndex = static_cast<int>(lfoSync_);
|
||||
|
||||
if (syncIndex < 0)
|
||||
syncIndex = 0;
|
||||
if (syncIndex > 6)
|
||||
syncIndex = 6;
|
||||
|
||||
if (timePos.bbt.valid && timePos.playing &&
|
||||
timePos.bbt.beatsPerMinute > 0.0) {
|
||||
float bpb = static_cast<float>(timePos.bbt.beatsPerBar);
|
||||
float bpm = static_cast<float>(timePos.bbt.beatsPerMinute);
|
||||
float bar = static_cast<float>(timePos.bbt.bar);
|
||||
|
||||
float baseFreq = (bpm / 60.0f) * 4.0f;
|
||||
if (bar != currentBar_) {
|
||||
lfo_.reset();
|
||||
currentBar_ = bar;
|
||||
}
|
||||
|
||||
float baseFreq = (bpm / 60.0f) / bpb;
|
||||
|
||||
static const float multipliers[] = {1.0f, 2.0f, 4.0f, 8.0f,
|
||||
16.0f, 32.0f, 64.0f};
|
||||
|
||||
targetFreq = baseFreq * multipliers[syncIndex];
|
||||
|
||||
static int lastBar = -1;
|
||||
if (timePos.bbt.bar != lastBar) {
|
||||
lfo_.reset();
|
||||
lastBar = timePos.bbt.bar;
|
||||
}
|
||||
targetFreq = baseFreq * multipliers[static_cast<int>(lfoSync_)];
|
||||
} else {
|
||||
|
||||
targetFreq = 1.0f;
|
||||
}
|
||||
|
||||
|
|
@ -193,6 +187,7 @@ private:
|
|||
Filter filter_;
|
||||
Oscillator lfo_;
|
||||
float lfoSync_;
|
||||
uint32_t currentBar_ = 0;
|
||||
float lfoBuffer_[BUFFER_SIZE];
|
||||
|
||||
DISTRHO_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(SquidgeFilter);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue