From fba42201f418cb2f1bc4379d50feda2f5cbca6f3 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Tue, 29 Jan 2019 11:58:06 -0500 Subject: [PATCH] Update to Rack v1 API --- src/ADSR.cpp | 6 +++--- src/Delay.cpp | 6 +++--- src/LFO.cpp | 4 ++-- src/SEQ3.cpp | 2 +- src/Scope.cpp | 6 +++--- src/VCF.cpp | 4 ++-- src/VCO.cpp | 6 +++--- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/ADSR.cpp b/src/ADSR.cpp index fa5ad31..d880ada 100644 --- a/src/ADSR.cpp +++ b/src/ADSR.cpp @@ -62,7 +62,7 @@ struct ADSR : Module { env = sustain; } else { - env += std::pow(base, 1 - decay) / maxTime * (sustain - env) * app()->engine->getSampleTime(); + env += std::pow(base, 1 - decay) / maxTime * (sustain - env) * APP->engine->getSampleTime(); } } else { @@ -72,7 +72,7 @@ struct ADSR : Module { env = 1.f; } else { - env += std::pow(base, 1 - attack) / maxTime * (1.01f - env) * app()->engine->getSampleTime(); + env += std::pow(base, 1 - attack) / maxTime * (1.01f - env) * APP->engine->getSampleTime(); } if (env >= 1.f) { env = 1.f; @@ -86,7 +86,7 @@ struct ADSR : Module { env = 0.f; } else { - env += std::pow(base, 1 - release) / maxTime * (0.f - env) * app()->engine->getSampleTime(); + env += std::pow(base, 1 - release) / maxTime * (0.f - env) * APP->engine->getSampleTime(); } decaying = false; } diff --git a/src/Delay.cpp b/src/Delay.cpp index 5a63ebf..5d28337 100644 --- a/src/Delay.cpp +++ b/src/Delay.cpp @@ -56,7 +56,7 @@ struct Delay : Module { // Compute delay time in seconds float delay = 1e-3 * std::pow(10.0f / 1e-3, clamp(params[TIME_PARAM].value + inputs[TIME_INPUT].value / 10.0f, 0.0f, 1.0f)); // Number of delay samples - float index = delay * app()->engine->getSampleRate(); + float index = delay * APP->engine->getSampleRate(); // Push dry sample into history buffer if (!historyBuffer.full()) { @@ -93,11 +93,11 @@ struct Delay : Module { // TODO Make it sound better float color = clamp(params[COLOR_PARAM].value + inputs[COLOR_INPUT].value / 10.0f, 0.0f, 1.0f); float lowpassFreq = 10000.0f * std::pow(10.0f, clamp(2.0f*color, 0.0f, 1.0f)); - lowpassFilter.setCutoff(lowpassFreq / app()->engine->getSampleRate()); + lowpassFilter.setCutoff(lowpassFreq / APP->engine->getSampleRate()); lowpassFilter.process(wet); wet = lowpassFilter.lowpass(); float highpassFreq = 10.0f * std::pow(100.0f, clamp(2.0f*color - 1.0f, 0.0f, 1.0f)); - highpassFilter.setCutoff(highpassFreq / app()->engine->getSampleRate()); + highpassFilter.setCutoff(highpassFreq / APP->engine->getSampleRate()); highpassFilter.process(wet); wet = highpassFilter.highpass(); diff --git a/src/LFO.cpp b/src/LFO.cpp index 173d94a..72bec8e 100644 --- a/src/LFO.cpp +++ b/src/LFO.cpp @@ -112,7 +112,7 @@ struct LFO : Module { oscillator.setPulseWidth(params[PW_PARAM].value + params[PWM_PARAM].value * inputs[PW_INPUT].value / 10.f); oscillator.offset = (params[OFFSET_PARAM].value > 0.f); oscillator.invert = (params[INVERT_PARAM].value <= 0.f); - oscillator.step(app()->engine->getSampleTime()); + oscillator.step(APP->engine->getSampleTime()); oscillator.setReset(inputs[RESET_INPUT].value); outputs[SIN_OUTPUT].value = 5.f * oscillator.sin(); @@ -205,7 +205,7 @@ struct LFO2 : Module { oscillator.setPitch(params[FREQ_PARAM].value + params[FM_PARAM].value * inputs[FM_INPUT].value); oscillator.offset = (params[OFFSET_PARAM].value > 0.f); oscillator.invert = (params[INVERT_PARAM].value <= 0.f); - oscillator.step(app()->engine->getSampleTime()); + oscillator.step(APP->engine->getSampleTime()); oscillator.setReset(inputs[RESET_INPUT].value); float wave = params[WAVE_PARAM].value + inputs[WAVE_INPUT].value; diff --git a/src/SEQ3.cpp b/src/SEQ3.cpp index 55b4690..e278b50 100644 --- a/src/SEQ3.cpp +++ b/src/SEQ3.cpp @@ -135,7 +135,7 @@ struct SEQ3 : Module { else { // Internal clock float clockTime = std::pow(2.0f, params[CLOCK_PARAM].value + inputs[CLOCK_INPUT].value); - phase += clockTime * app()->engine->getSampleTime(); + phase += clockTime * APP->engine->getSampleTime(); if (phase >= 1.0f) { setIndex(index + 1); } diff --git a/src/Scope.cpp b/src/Scope.cpp index 859a8f1..ac85942 100644 --- a/src/Scope.cpp +++ b/src/Scope.cpp @@ -73,7 +73,7 @@ struct Scope : Module { // Compute time float deltaTime = std::pow(2.0f, -params[TIME_PARAM].value); - int frameCount = (int) std::ceil(deltaTime * app()->engine->getSampleRate()); + int frameCount = (int) std::ceil(deltaTime * APP->engine->getSampleRate()); // Add frame to buffer if (bufferIndex < BUFFER_SIZE) { @@ -105,12 +105,12 @@ struct Scope : Module { // Reset if triggered float holdTime = 0.1f; - if (resetTrigger.process(rescale(gate, params[TRIG_PARAM].value - 0.1f, params[TRIG_PARAM].value, 0.f, 1.f)) || (frameIndex >= app()->engine->getSampleRate() * holdTime)) { + if (resetTrigger.process(rescale(gate, params[TRIG_PARAM].value - 0.1f, params[TRIG_PARAM].value, 0.f, 1.f)) || (frameIndex >= APP->engine->getSampleRate() * holdTime)) { bufferIndex = 0; frameIndex = 0; return; } // Reset if we've waited too long - if (frameIndex >= app()->engine->getSampleRate() * holdTime) { + if (frameIndex >= APP->engine->getSampleRate() * holdTime) { bufferIndex = 0; frameIndex = 0; return; } } diff --git a/src/VCF.cpp b/src/VCF.cpp index cbf2890..e33a8e7 100644 --- a/src/VCF.cpp +++ b/src/VCF.cpp @@ -122,7 +122,7 @@ struct VCF : Module { /* // Process sample - float dt = app()->engine->getSampleTime() / UPSAMPLE; + float dt = APP->engine->getSampleTime() / UPSAMPLE; float inputBuf[UPSAMPLE]; float lowpassBuf[UPSAMPLE]; float highpassBuf[UPSAMPLE]; @@ -142,7 +142,7 @@ struct VCF : Module { outputs[HPF_OUTPUT].value = 5.f * highpassDecimator.process(highpassBuf); } */ - filter.process(input, app()->engine->getSampleTime()); + filter.process(input, APP->engine->getSampleTime()); outputs[LPF_OUTPUT].value = 5.f * filter.lowpass; outputs[HPF_OUTPUT].value = 5.f * filter.highpass; } diff --git a/src/VCO.cpp b/src/VCO.cpp index c64c93b..9b69e64 100644 --- a/src/VCO.cpp +++ b/src/VCO.cpp @@ -58,7 +58,7 @@ struct VoltageControlledOscillator { // Adjust pitch slew if (++pitchSlewIndex > 32) { const float pitchSlewTau = 100.f; // Time constant for leaky integrator in seconds - pitchSlew += (random::normal() - pitchSlew / pitchSlewTau) * app()->engine->getSampleTime(); + pitchSlew += (random::normal() - pitchSlew / pitchSlewTau) * APP->engine->getSampleTime(); pitchSlewIndex = 0; } } @@ -217,7 +217,7 @@ struct VCO : Module { oscillator.setPulseWidth(params[PW_PARAM].value + params[PWM_PARAM].value * inputs[PW_INPUT].value / 10.f); oscillator.syncEnabled = inputs[SYNC_INPUT].active; - oscillator.process(app()->engine->getSampleTime(), inputs[SYNC_INPUT].value); + oscillator.process(APP->engine->getSampleTime(), inputs[SYNC_INPUT].value); // Set output if (outputs[SIN_OUTPUT].active) @@ -316,7 +316,7 @@ struct VCO2 : Module { oscillator.setPitch(0.f, pitchCv); oscillator.syncEnabled = inputs[SYNC_INPUT].active; - oscillator.process(app()->engine->getSampleTime(), inputs[SYNC_INPUT].value); + oscillator.process(APP->engine->getSampleTime(), inputs[SYNC_INPUT].value); // Set output float wave = clamp(params[WAVE_PARAM].value + inputs[WAVE_INPUT].value, 0.f, 3.f);