commit b2c8000ff28b4346c809240b1c272ebb333082d9 parent 5b87bb8713cd0ae44441dbc62c2288ba2974b659 Author: Matt Demanett <matt@demanett.net> Date: Sat, 18 May 2019 18:41:41 -0400 v1: APP->engine->getSample(Rate|Time). Diffstat:
46 files changed, 109 insertions(+), 109 deletions(-)
diff --git a/src/AD.cpp b/src/AD.cpp @@ -10,7 +10,7 @@ void AD::onReset() { } void AD::onSampleRateChange() { - float sr = engineGetSampleRate(); + float sr = APP->engine->getSampleRate(); _envelope.setSampleRate(sr); _attackSL.setParams(sr / (float)modulationSteps); _decaySL.setParams(sr / (float)modulationSteps); @@ -54,7 +54,7 @@ void AD::process(const ProcessArgs& args) { _on = false; _eocPulseGen.trigger(0.001f); } - outputs[EOC_OUTPUT].value = _eocPulseGen.process(engineGetSampleTime()) ? 5.0f : 0.0f; + outputs[EOC_OUTPUT].value = _eocPulseGen.process(APP->engine->getSampleTime()) ? 5.0f : 0.0f; lights[ATTACK_LIGHT].value = _envelope.isStage(ADSR::ATTACK_STAGE); lights[DECAY_LIGHT].value = _envelope.isStage(ADSR::DECAY_STAGE); diff --git a/src/ADSR.cpp b/src/ADSR.cpp @@ -8,7 +8,7 @@ void ADSR::onReset() { } void ADSR::onSampleRateChange() { - _envelope.setSampleRate(engineGetSampleRate()); + _envelope.setSampleRate(APP->engine->getSampleRate()); _modulationStep = modulationSteps; } diff --git a/src/Additator.cpp b/src/Additator.cpp @@ -19,7 +19,7 @@ void Additator::onReset() { } void Additator::onSampleRateChange() { - float sampleRate = engineGetSampleRate(); + float sampleRate = APP->engine->getSampleRate(); _oscillator.setSampleRate(sampleRate); _maxFrequency = 0.475f * sampleRate; _steps = modulationSteps; diff --git a/src/AddrSeq.cpp b/src/AddrSeq.cpp @@ -10,7 +10,7 @@ void AddrSeq::onReset() { } void AddrSeq::onSampleRateChange() { - _timer.setParams(engineGetSampleRate(), 0.001f); + _timer.setParams(APP->engine->getSampleRate(), 0.001f); } json_t* AddrSeq::dataToJson() { diff --git a/src/Analyzer.cpp b/src/Analyzer.cpp @@ -33,7 +33,7 @@ void Analyzer::process(const ProcessArgs& args) { float range = params[RANGE2_PARAM].value; _rangeMinHz = 0.0f; - _rangeMaxHz = 0.5f * engineGetSampleRate(); + _rangeMaxHz = 0.5f * APP->engine->getSampleRate(); if (range < 0.0f) { range *= 0.9f; _rangeMaxHz *= 1.0f + range; @@ -46,7 +46,7 @@ void Analyzer::process(const ProcessArgs& args) { const float maxTime = 0.5; float smooth = params[SMOOTH_PARAM].value * maxTime; - smooth /= _core.size() / (_core._overlap * engineGetSampleRate()); + smooth /= _core.size() / (_core._overlap * APP->engine->getSampleRate()); int averageN = std::max(1, (int)roundf(smooth)); AnalyzerCore::Quality quality = AnalyzerCore::QUALITY_GOOD; diff --git a/src/AnalyzerXL.cpp b/src/AnalyzerXL.cpp @@ -33,7 +33,7 @@ void AnalyzerXL::onSampleRateChange() { void AnalyzerXL::setCoreParams() { _rangeMinHz = 0.0f; - _rangeMaxHz = 0.5f * engineGetSampleRate(); + _rangeMaxHz = 0.5f * APP->engine->getSampleRate(); if (_range < 0.0f) { _rangeMaxHz *= 1.0f + _range; } @@ -41,7 +41,7 @@ void AnalyzerXL::setCoreParams() { _rangeMinHz = _range * _rangeMaxHz; } - float smooth = _smooth / (_core.size() / (_core._overlap * engineGetSampleRate())); + float smooth = _smooth / (_core.size() / (_core._overlap * APP->engine->getSampleRate())); int averageN = std::max(1, (int)roundf(smooth)); _core.setParams(averageN, _quality, _window); } diff --git a/src/Blank3.cpp b/src/Blank3.cpp @@ -2,7 +2,7 @@ #include "Blank3.hpp" void Blank3::onSampleRateChange() { - _rms.setSampleRate(engineGetSampleRate()); + _rms.setSampleRate(APP->engine->getSampleRate()); } void Blank3::process(const ProcessArgs& args) { diff --git a/src/Blank6.cpp b/src/Blank6.cpp @@ -2,7 +2,7 @@ #include "Blank6.hpp" void Blank6::onSampleRateChange() { - _rms.setSampleRate(engineGetSampleRate()); + _rms.setSampleRate(APP->engine->getSampleRate()); } void Blank6::process(const ProcessArgs& args) { diff --git a/src/CVD.cpp b/src/CVD.cpp @@ -2,7 +2,7 @@ #include "CVD.hpp" void CVD::onSampleRateChange() { - _delay.setSampleRate(engineGetSampleRate()); + _delay.setSampleRate(APP->engine->getSampleRate()); } void CVD::process(const ProcessArgs& args) { diff --git a/src/Cmp.cpp b/src/Cmp.cpp @@ -150,7 +150,7 @@ int Cmp::lagInSamples() { if (inputs[LAG_INPUT].active) { lag *= clamp(inputs[LAG_INPUT].value / 10.0f, 0.0f, 1.0f); } - return lag * lag * engineGetSampleRate(); + return lag * lag * APP->engine->getSampleRate(); } struct CmpWidget : ModuleWidget { diff --git a/src/DGate.cpp b/src/DGate.cpp @@ -53,7 +53,7 @@ void DGate::process(const ProcessArgs& args) { if (complete) { _triggerOuptutPulseGen.trigger(0.001); } - outputs[END_OUTPUT].value = _triggerOuptutPulseGen.process(engineGetSampleTime()) ? 5.0 : 0.0; + outputs[END_OUTPUT].value = _triggerOuptutPulseGen.process(APP->engine->getSampleTime()) ? 5.0 : 0.0; lights[DELAY_LIGHT].value = _stage == DELAY_STAGE; lights[GATE_LIGHT].value = _stage == GATE_STAGE; @@ -66,7 +66,7 @@ bool DGate::stepStage(Param& knob) { t = pow(t, 2); t = fmaxf(t, 0.001); t *= 10.0; - _stageProgress += engineGetSampleTime() / t; + _stageProgress += APP->engine->getSampleTime() / t; return _stageProgress > 1.0; } diff --git a/src/EightFO.cpp b/src/EightFO.cpp @@ -17,7 +17,7 @@ void EightFO::onReset() { } void EightFO::onSampleRateChange() { - _phasor.setSampleRate(engineGetSampleRate()); + _phasor.setSampleRate(APP->engine->getSampleRate()); _modulationStep = modulationSteps; _sampleStep = _phasor._sampleRate; } diff --git a/src/EightOne.cpp b/src/EightOne.cpp @@ -10,7 +10,7 @@ void EightOne::onReset() { } void EightOne::onSampleRateChange() { - _timer.setParams(engineGetSampleRate(), 0.001f); + _timer.setParams(APP->engine->getSampleRate(), 0.001f); } json_t* EightOne::dataToJson() { diff --git a/src/FMOp.cpp b/src/FMOp.cpp @@ -12,7 +12,7 @@ void FMOp::onReset() { void FMOp::onSampleRateChange() { _steps = modulationSteps; - float sampleRate = engineGetSampleRate(); + float sampleRate = APP->engine->getSampleRate(); _envelope.setSampleRate(sampleRate); _phasor.setSampleRate(sampleRate); _decimator.setParams(sampleRate, oversample); diff --git a/src/Follow.cpp b/src/Follow.cpp @@ -2,7 +2,7 @@ #include "Follow.hpp" void Follow::onSampleRateChange() { - _rms.setSampleRate(engineGetSampleRate()); + _rms.setSampleRate(APP->engine->getSampleRate()); } void Follow::process(const ProcessArgs& args) { diff --git a/src/LFO.cpp b/src/LFO.cpp @@ -8,7 +8,7 @@ void LFO::onReset() { } void LFO::onSampleRateChange() { - _phasor.setSampleRate(engineGetSampleRate()); + _phasor.setSampleRate(APP->engine->getSampleRate()); _modulationStep = modulationSteps; _sampleStep = _phasor._sampleRate; } diff --git a/src/LLFO.cpp b/src/LLFO.cpp @@ -7,7 +7,7 @@ void LLFO::onReset() { } void LLFO::onSampleRateChange() { - _phasor.setSampleRate(engineGetSampleRate()); + _phasor.setSampleRate(APP->engine->getSampleRate()); _modulationStep = modulationSteps; } diff --git a/src/Lag.cpp b/src/Lag.cpp @@ -43,7 +43,7 @@ void Lag::process(const ProcessArgs& args) { shape += 1.0f; } - _slew.setParams(engineGetSampleRate(), time, shape); + _slew.setParams(APP->engine->getSampleRate(), time, shape); } outputs[OUT_OUTPUT].value = _slew.next(inputs[IN_INPUT].value); diff --git a/src/Lmtr.cpp b/src/Lmtr.cpp @@ -6,7 +6,7 @@ void Lmtr::onReset() { } void Lmtr::onSampleRateChange() { - float sampleRate = engineGetSampleRate(); + float sampleRate = APP->engine->getSampleRate(); _detector.setSampleRate(sampleRate); _attackSL.setParams(sampleRate, 150.0f); _releaseSL.setParams(sampleRate, 600.0f); diff --git a/src/Manual.cpp b/src/Manual.cpp @@ -10,10 +10,10 @@ void Manual::process(const ProcessArgs& args) { bool high = _trigger.process(params[TRIGGER_PARAM].value) || _trigger.isHigh() || (_firstStep && _triggerOnLoad && _shouldTriggerOnLoad); if (high) { _pulse.trigger(0.001f); - _pulse.process(engineGetSampleTime()); + _pulse.process(APP->engine->getSampleTime()); } else { - high = _pulse.process(engineGetSampleTime()); + high = _pulse.process(APP->engine->getSampleTime()); } float out = high ? 5.0f : 0.0f; diff --git a/src/Mix1.cpp b/src/Mix1.cpp @@ -2,7 +2,7 @@ #include "Mix1.hpp" void Mix1::onSampleRateChange() { - _channel.setSampleRate(engineGetSampleRate()); + _channel.setSampleRate(APP->engine->getSampleRate()); } void Mix1::process(const ProcessArgs& args) { diff --git a/src/Mix4.cpp b/src/Mix4.cpp @@ -2,7 +2,7 @@ #include "Mix4.hpp" void Mix4::onSampleRateChange() { - float sr = engineGetSampleRate(); + float sr = APP->engine->getSampleRate(); _channel1.setSampleRate(sr); _channel2.setSampleRate(sr); _channel3.setSampleRate(sr); diff --git a/src/Mix8.cpp b/src/Mix8.cpp @@ -2,7 +2,7 @@ #include "Mix8.hpp" void Mix8::onSampleRateChange() { - float sr = engineGetSampleRate(); + float sr = APP->engine->getSampleRate(); _channel1.setSampleRate(sr); _channel2.setSampleRate(sr); _channel3.setSampleRate(sr); diff --git a/src/Mute8.cpp b/src/Mute8.cpp @@ -13,7 +13,7 @@ void Mute8::onReset() { } void Mute8::onSampleRateChange() { - float sampleRate = engineGetSampleRate(); + float sampleRate = APP->engine->getSampleRate(); for (int i = 0; i < 8; ++i) { _slewLimiters[i].setParams(sampleRate, slewTimeMS, maxDecibels - minDecibels); } diff --git a/src/Nsgt.cpp b/src/Nsgt.cpp @@ -6,7 +6,7 @@ void Nsgt::onReset() { } void Nsgt::onSampleRateChange() { - float sampleRate = engineGetSampleRate(); + float sampleRate = APP->engine->getSampleRate(); _detector.setSampleRate(sampleRate); _attackSL.setParams(sampleRate, 150.0f); _releaseSL.setParams(sampleRate, 600.0f); diff --git a/src/OneEight.cpp b/src/OneEight.cpp @@ -10,7 +10,7 @@ void OneEight::onReset() { } void OneEight::onSampleRateChange() { - _timer.setParams(engineGetSampleRate(), 0.001f); + _timer.setParams(APP->engine->getSampleRate(), 0.001f); } json_t* OneEight::dataToJson() { diff --git a/src/Pan.cpp b/src/Pan.cpp @@ -3,8 +3,8 @@ #include "mixer.hpp" void Pan::onSampleRateChange() { - _slew1.setParams(engineGetSampleRate(), MixerChannel::panSlewTimeMS, 2.0f); - _slew2.setParams(engineGetSampleRate(), MixerChannel::panSlewTimeMS, 2.0f); + _slew1.setParams(APP->engine->getSampleRate(), MixerChannel::panSlewTimeMS, 2.0f); + _slew2.setParams(APP->engine->getSampleRate(), MixerChannel::panSlewTimeMS, 2.0f); } void Pan::process(const ProcessArgs& args) { diff --git a/src/Pressor.cpp b/src/Pressor.cpp @@ -6,7 +6,7 @@ void Pressor::onReset() { } void Pressor::onSampleRateChange() { - _detectorRMS.setSampleRate(engineGetSampleRate()); + _detectorRMS.setSampleRate(APP->engine->getSampleRate()); _modulationStep = modulationSteps; } @@ -47,7 +47,7 @@ void Pressor::process(const ProcessArgs& args) { _ratio = 1.0f / _ratio; } - float sampleRate = engineGetSampleRate(); + float sampleRate = APP->engine->getSampleRate(); float attack = params[ATTACK_PARAM].value; if (inputs[ATTACK_INPUT].active) { attack *= clamp(inputs[ATTACK_INPUT].value / 10.0f, 0.0f, 1.0f); diff --git a/src/Reftone.hpp b/src/Reftone.hpp @@ -44,7 +44,7 @@ struct Reftone : Module { } void onSampleRateChange() override { - _sine.setSampleRate(engineGetSampleRate()); + _sine.setSampleRate(APP->engine->getSampleRate()); } void process(const ProcessArgs& args) override; diff --git a/src/Slew.cpp b/src/Slew.cpp @@ -19,8 +19,8 @@ void Slew::process(const ProcessArgs& args) { float fallTime = time(params[FALL_PARAM], inputs[FALL_INPUT]); float fallShape = shape(params[FALL_SHAPE_PARAM]); - _rise.setParams(engineGetSampleRate(), riseTime, riseShape); - _fall.setParams(engineGetSampleRate(), fallTime, fallShape); + _rise.setParams(APP->engine->getSampleRate(), riseTime, riseShape); + _fall.setParams(APP->engine->getSampleRate(), fallTime, fallShape); } float sample = inputs[IN_INPUT].value; diff --git a/src/Test.cpp b/src/Test.cpp @@ -14,7 +14,7 @@ void Test::process(const ProcessArgs& args) { return; } _lpf.setParams( - engineGetSampleRate(), + APP->engine->getSampleRate(), 10000.0 * clamp(params[PARAM1_PARAM].value, 0.0f, 1.0f), std::max(10.0 * clamp(params[PARAM2_PARAM].value, 0.0f, 1.0f), 0.1) ); @@ -22,7 +22,7 @@ void Test::process(const ProcessArgs& args) { #elif LPFNOISE _lpf.setParams( - engineGetSampleRate(), + APP->engine->getSampleRate(), 22000.0 * clamp(params[PARAM1_PARAM].value, 0.0f, 1.0f), 0.717f ); @@ -31,16 +31,16 @@ void Test::process(const ProcessArgs& args) { outputs[OUT2_OUTPUT].value = noise * 10.0;; #elif SINE - _sine.setSampleRate(engineGetSampleRate()); + _sine.setSampleRate(APP->engine->getSampleRate()); _sine.setFrequency(oscillatorPitch()); outputs[OUT_OUTPUT].value = _sine.next() * 5.0f; - _sine2.setSampleRate(engineGetSampleRate()); + _sine2.setSampleRate(APP->engine->getSampleRate()); _sine2.setFrequency(oscillatorPitch()); outputs[OUT2_OUTPUT].value = _sine2.next() * 5.0f; #elif SQUARE - _square.setSampleRate(engineGetSampleRate()); + _square.setSampleRate(APP->engine->getSampleRate()); _square.setFrequency(oscillatorPitch()); float pw = params[PARAM2_PARAM].value; if (inputs[CV2_INPUT].active) { @@ -49,18 +49,18 @@ void Test::process(const ProcessArgs& args) { _square.setPulseWidth(pw); outputs[OUT_OUTPUT].value = _square.next() * 5.0f; - _square2.setSampleRate(engineGetSampleRate()); + _square2.setSampleRate(APP->engine->getSampleRate()); _square2.setFrequency(oscillatorPitch()); _square2.setPulseWidth(pw); _square2.setQuality(params[PARAM3_PARAM].value * 200); outputs[OUT2_OUTPUT].value = _square2.next() * 5.0f; #elif SAW - _saw.setSampleRate(engineGetSampleRate()); + _saw.setSampleRate(APP->engine->getSampleRate()); _saw.setFrequency(oscillatorPitch()); outputs[OUT_OUTPUT].value = _saw.next() * 5.0f; - _saw2.setSampleRate(engineGetSampleRate()); + _saw2.setSampleRate(APP->engine->getSampleRate()); _saw2.setFrequency(oscillatorPitch()); _saw2.setQuality(params[PARAM2_PARAM].value * 200); outputs[OUT2_OUTPUT].value = _saw2.next() * 5.0f; @@ -70,19 +70,19 @@ void Test::process(const ProcessArgs& args) { if (inputs[CV2_INPUT].active) { saturation *= clamp(inputs[CV2_INPUT].value / 10.0f, 0.0f, 1.0f); } - _saw.setSampleRate(engineGetSampleRate()); + _saw.setSampleRate(APP->engine->getSampleRate()); _saw.setFrequency(oscillatorPitch()); _saw.setSaturation(saturation); outputs[OUT_OUTPUT].value = _saw.next() * 5.0f; - _saw2.setSampleRate(engineGetSampleRate()); + _saw2.setSampleRate(APP->engine->getSampleRate()); _saw2.setFrequency(oscillatorPitch()); _saw2.setSaturation(saturation); _saw2.setQuality(params[PARAM3_PARAM].value * 200); outputs[OUT2_OUTPUT].value = _saw2.next() * 5.0f; #elif TRIANGLE - _triangle.setSampleRate(engineGetSampleRate()); + _triangle.setSampleRate(APP->engine->getSampleRate()); _triangle.setFrequency(oscillatorPitch()); outputs[OUT_OUTPUT].value = _triangle.next() * 5.0f; @@ -91,12 +91,12 @@ void Test::process(const ProcessArgs& args) { if (inputs[CV2_INPUT].active) { sample *= clamp(inputs[CV2_INPUT].value / 10.0f, 0.0f, 1.0f); } - _triangle.setSampleRate(engineGetSampleRate()); + _triangle.setSampleRate(APP->engine->getSampleRate()); _triangle.setFrequency(oscillatorPitch()); _triangle.setSampleWidth(sample); outputs[OUT_OUTPUT].value = _triangle.next() * 5.0f; - _triangle2.setSampleRate(engineGetSampleRate()); + _triangle2.setSampleRate(APP->engine->getSampleRate()); _triangle2.setFrequency(oscillatorPitch()); float maxSampleSteps = (_triangle2._sampleRate / _triangle2._frequency) / 4.0f; _sampleSteps = clamp((int)((4.0f * sample) * maxSampleSteps), 1, (int)maxSampleSteps); @@ -111,12 +111,12 @@ void Test::process(const ProcessArgs& args) { outputs[OUT2_OUTPUT].value = _sample; #elif SINEBANK - _sineBank.setSampleRate(engineGetSampleRate()); + _sineBank.setSampleRate(APP->engine->getSampleRate()); _sineBank.setFrequency(oscillatorPitch()); outputs[OUT_OUTPUT].value = _sineBank.next(); #elif OVERSAMPLING - _saw1.setSampleRate(engineGetSampleRate()); + _saw1.setSampleRate(APP->engine->getSampleRate()); _saw1.setFrequency(oscillatorPitch() / (float)OVERSAMPLEN); float buf[OVERSAMPLEN]; for (int i = 0; i < OVERSAMPLEN; ++i) { @@ -124,16 +124,16 @@ void Test::process(const ProcessArgs& args) { } outputs[OUT_OUTPUT].value = _rackDecimator.process(buf) * 5.0f; - _saw2.setSampleRate(engineGetSampleRate()); + _saw2.setSampleRate(APP->engine->getSampleRate()); _saw2.setFrequency(oscillatorPitch() / (float)OVERSAMPLEN); _lpf.setParams( - engineGetSampleRate(), - engineGetSampleRate() / 4.0f, + APP->engine->getSampleRate(), + APP->engine->getSampleRate() / 4.0f, 0.03 ); _lpf2.setParams( - engineGetSampleRate(), - engineGetSampleRate() / 4.0f, + APP->engine->getSampleRate(), + APP->engine->getSampleRate() / 4.0f, 0.03 ); float s = 0.0f; @@ -149,12 +149,12 @@ void Test::process(const ProcessArgs& args) { const int maxOversample = 16; int oversample = params[PARAM3_PARAM].value * maxOversample; - _saw1.setSampleRate(engineGetSampleRate()); + _saw1.setSampleRate(APP->engine->getSampleRate()); _saw1.setFrequency(oscillatorPitch()); _saw1.setQuality(quality); outputs[OUT_OUTPUT].value = _saw1.next() * 5.0f; - _saw2.setSampleRate(engineGetSampleRate()); + _saw2.setSampleRate(APP->engine->getSampleRate()); _saw2.setQuality(quality); if (oversample < 2) { _saw2.setFrequency(oscillatorPitch()); @@ -163,8 +163,8 @@ void Test::process(const ProcessArgs& args) { else { _saw2.setFrequency(oscillatorPitch() / (float)oversample); _lpf.setParams( - oversample * engineGetSampleRate(), - 0.95f * engineGetSampleRate(), + oversample * APP->engine->getSampleRate(), + 0.95f * APP->engine->getSampleRate(), 0.03 ); float s = 0.0f; @@ -178,7 +178,7 @@ void Test::process(const ProcessArgs& args) { const int quality = 12; const float oversampleThreshold = 0.06f; const float oversampleMixWidth = 100.0f; - float sampleRate = engineGetSampleRate(); + float sampleRate = APP->engine->getSampleRate(); float frequency = oscillatorPitch(15000.0); float otf = oversampleThreshold * sampleRate; @@ -252,7 +252,7 @@ void Test::process(const ProcessArgs& args) { #elif DECIMATORS const int quality = 12; - float sampleRate = engineGetSampleRate(); + float sampleRate = APP->engine->getSampleRate(); float frequency = oscillatorPitch(15000.0); _saw.setSampleRate(sampleRate); _saw.setFrequency(frequency / (float)OVERSAMPLEN); @@ -270,7 +270,7 @@ void Test::process(const ProcessArgs& args) { #elif INTERPOLATOR const int quality = 12; - float sampleRate = engineGetSampleRate(); + float sampleRate = APP->engine->getSampleRate(); float frequency = oscillatorPitch(); _saw.setSampleRate(sampleRate); _saw.setFrequency(frequency); @@ -294,7 +294,7 @@ void Test::process(const ProcessArgs& args) { float baseHz = oscillatorPitch(); float ratio = ratio2(); float index = index3(); - float sampleRate = engineGetSampleRate(); + float sampleRate = APP->engine->getSampleRate(); if (_baseHz != baseHz || _ratio != ratio || _index != index || _sampleRate != sampleRate) { _baseHz = baseHz; _ratio = ratio; @@ -307,9 +307,9 @@ void Test::process(const ProcessArgs& args) { _modulator.setSampleRate(_sampleRate); _carrier.setSampleRate(_sampleRate); - _carrier2.setSampleRate(engineGetSampleRate()); + _carrier2.setSampleRate(APP->engine->getSampleRate()); _carrier2.setFrequency(baseHz); - _modulator2.setSampleRate(engineGetSampleRate()); + _modulator2.setSampleRate(APP->engine->getSampleRate()); _modulator2.setFrequency(modHz); } @@ -326,15 +326,15 @@ void Test::process(const ProcessArgs& args) { const float amplitude = 5.0f; float baseHz = oscillatorPitch(); float modHz = ratio2() * baseHz; - _carrier.setSampleRate(engineGetSampleRate()); + _carrier.setSampleRate(APP->engine->getSampleRate()); _carrier.setFrequency(baseHz); - _modulator.setSampleRate(engineGetSampleRate()); + _modulator.setSampleRate(APP->engine->getSampleRate()); _modulator.setFrequency(modHz); _carrier.advancePhase(); outputs[OUT_OUTPUT].value = _carrier.nextFromPhasor(_carrier, Phasor::radiansToPhase(index3() * _modulator.next())) * amplitude; #elif FEEDBACK_PM - _carrier.setSampleRate(engineGetSampleRate()); + _carrier.setSampleRate(APP->engine->getSampleRate()); _carrier.setFrequency(oscillatorPitch()); float feedback = params[PARAM2_PARAM].value; if (inputs[CV2_INPUT].active) { @@ -344,7 +344,7 @@ void Test::process(const ProcessArgs& args) { outputs[OUT_OUTPUT].value = _feedbackSample = _carrier.nextFromPhasor(_carrier, Phasor::radiansToPhase(feedback * _feedbackSample)) * 5.0f; #elif EG - _envelope.setSampleRate(engineGetSampleRate()); + _envelope.setSampleRate(APP->engine->getSampleRate()); _envelope.setAttack(params[PARAM1_PARAM].value); _envelope.setDecay(params[PARAM2_PARAM].value); _envelope.setSustain(params[PARAM3_PARAM].value); @@ -353,11 +353,11 @@ void Test::process(const ProcessArgs& args) { outputs[OUT_OUTPUT].value = _envelope.next() * 10.0f; #elif TABLES - _sine.setSampleRate(engineGetSampleRate()); + _sine.setSampleRate(APP->engine->getSampleRate()); _sine.setFrequency(oscillatorPitch()); outputs[OUT_OUTPUT].value = _sine.next() * 5.0f; - _table.setSampleRate(engineGetSampleRate()); + _table.setSampleRate(APP->engine->getSampleRate()); _table.setFrequency(oscillatorPitch()); outputs[OUT2_OUTPUT].value = _table.next() * 5.0f; @@ -368,7 +368,7 @@ void Test::process(const ProcessArgs& args) { } ms = powf(ms, 2.0f); ms *= 10000.0f; - _slew.setParams(engineGetSampleRate(), ms); + _slew.setParams(APP->engine->getSampleRate(), ms); outputs[OUT_OUTPUT].value = _slew.next(inputs[IN_INPUT].value); float shape = params[PARAM2_PARAM].value; @@ -385,7 +385,7 @@ void Test::process(const ProcessArgs& args) { shape *= (_slew2.maxShape - 1.0f); shape += 1.0f; } - _slew2.setParams(engineGetSampleRate(), ms, shape); + _slew2.setParams(APP->engine->getSampleRate(), ms, shape); outputs[OUT2_OUTPUT].value = _slew2.next(inputs[IN_INPUT].value); #elif RMS @@ -393,7 +393,7 @@ void Test::process(const ProcessArgs& args) { if (inputs[CV2_INPUT].active) { sensitivity *= clamp(inputs[CV2_INPUT].value, 0.0f, 10.0f) / 10.0f; } - _rms.setSampleRate(engineGetSampleRate()); + _rms.setSampleRate(APP->engine->getSampleRate()); _rms.setSensitivity(sensitivity); outputs[OUT_OUTPUT].value = _rms.next(inputs[IN_INPUT].value); _pef.setSensitivity(sensitivity); @@ -415,8 +415,8 @@ void Test::process(const ProcessArgs& args) { float change = clamp(1.0f - params[PARAM1_PARAM].value, 0.01f, 1.0f); float smooth = clamp(params[PARAM2_PARAM].value, 0.01f, 1.0f); smooth *= smooth; - _filter1.setParams(engineGetSampleRate(), smooth * engineGetSampleRate() * 0.49f); - _filter2.setParams(engineGetSampleRate(), smooth * engineGetSampleRate() * 0.49f); + _filter1.setParams(APP->engine->getSampleRate(), smooth * APP->engine->getSampleRate() * 0.49f); + _filter2.setParams(APP->engine->getSampleRate(), smooth * APP->engine->getSampleRate() * 0.49f); _last1 = _last1 + _noise1.next() / (change * maxDiv); outputs[OUT_OUTPUT].value = _filter1.next(_last1); @@ -441,8 +441,8 @@ void Test::process(const ProcessArgs& args) { float change = params[PARAM1_PARAM].value; change *= change; change *= change; - _walk1.setParams(engineGetSampleRate(), change); - _walk2.setParams(engineGetSampleRate(), change); + _walk1.setParams(APP->engine->getSampleRate(), change); + _walk2.setParams(APP->engine->getSampleRate(), change); outputs[OUT_OUTPUT].value = _walk1.next(); outputs[OUT2_OUTPUT].value = _walk2.next(); #endif diff --git a/src/Test.hpp b/src/Test.hpp @@ -246,7 +246,7 @@ struct Test : Module { #elif TABLES , _table(StaticBlepTable::table(), 44100.0, 1000.0) #elif RAVG - , _average(engineGetSampleRate(), 1.0f, 1000.0f) + , _average(APP->engine->getSampleRate(), 1.0f, 1000.0f) #endif { onReset(); diff --git a/src/Test2.cpp b/src/Test2.cpp @@ -35,15 +35,15 @@ void Test2::process(const ProcessArgs& args) { _filter.setParams( params[PARAM2A_PARAM].value <= 0.5f ? MultipoleFilter::LP_TYPE : MultipoleFilter::HP_TYPE, 2 * clamp((int)(params[PARAM1B_PARAM].value * (MultipoleFilter::maxPoles / 2)), 1, MultipoleFilter::maxPoles / 2), - engineGetSampleRate(), - params[PARAM1A_PARAM].value * engineGetSampleRate() / 2.0f, + APP->engine->getSampleRate(), + params[PARAM1A_PARAM].value * APP->engine->getSampleRate() / 2.0f, params[PARAM2B_PARAM].value * MultipoleFilter::maxRipple ); // _filter.setParams( // MultipoleFilter::HP_TYPE, // 4, - // engineGetSampleRate(), - // 0.1f * engineGetSampleRate(), + // APP->engine->getSampleRate(), + // 0.1f * APP->engine->getSampleRate(), // 0.1f // ); } @@ -55,7 +55,7 @@ void Test2::process(const ProcessArgs& args) { #elif ADSR_ENVELOPE if (outputs[OUT_OUTPUT].active) { - _adsr.setSampleRate(engineGetSampleRate()); + _adsr.setSampleRate(APP->engine->getSampleRate()); if (inputs[IN_INPUT].active) { _trigger.process(inputs[IN_INPUT].value); } diff --git a/src/VCA.cpp b/src/VCA.cpp @@ -2,7 +2,7 @@ #include "VCA.hpp" void VCA::onSampleRateChange() { - float sampleRate = engineGetSampleRate(); + float sampleRate = APP->engine->getSampleRate(); _levelSL1.setParams(sampleRate, 5.0f, 1.0f); _levelSL2.setParams(sampleRate, 5.0f, 1.0f); } diff --git a/src/VCAmp.cpp b/src/VCAmp.cpp @@ -6,7 +6,7 @@ const float maxDecibels = 12.0f; const float minDecibels = Amplifier::minDecibels; void VCAmp::onSampleRateChange() { - float sampleRate = engineGetSampleRate(); + float sampleRate = APP->engine->getSampleRate(); _levelSL.setParams(sampleRate, MixerChannel::levelSlewTimeMS, maxDecibels - minDecibels); _rms.setSampleRate(sampleRate); } diff --git a/src/VCO.cpp b/src/VCO.cpp @@ -8,7 +8,7 @@ void VCO::onReset() { } void VCO::onSampleRateChange() { - setSampleRate(engineGetSampleRate()); + setSampleRate(APP->engine->getSampleRate()); _modulationStep = modulationSteps; } diff --git a/src/VCO.hpp b/src/VCO.hpp @@ -71,7 +71,7 @@ struct VCO : Module { VCO() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) { onReset(); - setSampleRate(engineGetSampleRate()); + setSampleRate(APP->engine->getSampleRate()); _saw.setQuality(12); _square.setQuality(12); } diff --git a/src/VU.cpp b/src/VU.cpp @@ -2,8 +2,8 @@ #include "VU.hpp" void VU::onSampleRateChange() { - _lRms.setSampleRate(engineGetSampleRate()); - _rRms.setSampleRate(engineGetSampleRate()); + _lRms.setSampleRate(APP->engine->getSampleRate()); + _rRms.setSampleRate(APP->engine->getSampleRate()); } void VU::process(const ProcessArgs& args) { diff --git a/src/Walk.cpp b/src/Walk.cpp @@ -8,7 +8,7 @@ void Walk::onReset() { void Walk::onSampleRateChange() { _modulationStep = modulationSteps; - _slew.setParams(engineGetSampleRate(), 100.0f, 10.0f); + _slew.setParams(APP->engine->getSampleRate(), 100.0f, 10.0f); } void Walk::process(const ProcessArgs& args) { @@ -21,7 +21,7 @@ void Walk::process(const ProcessArgs& args) { rate *= clamp(inputs[RATE_INPUT].value / 10.0f, 0.0f, 1.0f); } rate = 0.2f * powf(rate, 5.0f); - _walk.setParams(engineGetSampleRate(), rate); + _walk.setParams(APP->engine->getSampleRate(), rate); _offset = params[OFFSET_PARAM].value; if (inputs[OFFSET_INPUT].active) { diff --git a/src/Walk2.cpp b/src/Walk2.cpp @@ -12,7 +12,7 @@ void Walk2::onReset() { void Walk2::onSampleRateChange() { _modulationStep = modulationSteps; - _historySteps = (historySeconds * engineGetSampleRate()) / historyPoints; + _historySteps = (historySeconds * APP->engine->getSampleRate()) / historyPoints; } json_t* Walk2::dataToJson() { @@ -46,7 +46,7 @@ void Walk2::process(const ProcessArgs& args) { ++_modulationStep; if (_modulationStep >= modulationSteps) { _modulationStep = 0; - float sampleRate = engineGetSampleRate(); + float sampleRate = APP->engine->getSampleRate(); float rateX = params[RATE_X_PARAM].value; if (inputs[RATE_X_INPUT].active) { diff --git a/src/XCO.cpp b/src/XCO.cpp @@ -8,7 +8,7 @@ void XCO::onReset() { } void XCO::onSampleRateChange() { - setSampleRate(engineGetSampleRate()); + setSampleRate(APP->engine->getSampleRate()); _modulationStep = modulationSteps; } diff --git a/src/XCO.hpp b/src/XCO.hpp @@ -119,7 +119,7 @@ struct XCO : Module { XCO() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) { onReset(); - setSampleRate(engineGetSampleRate()); + setSampleRate(APP->engine->getSampleRate()); _saw.setQuality(12); _square.setQuality(12); } diff --git a/src/XFade.cpp b/src/XFade.cpp @@ -2,7 +2,7 @@ #include "XFade.hpp" void XFade::onSampleRateChange() { - _mixSL.setParams(engineGetSampleRate(), 10.0f, 2.0f); + _mixSL.setParams(APP->engine->getSampleRate(), 10.0f, 2.0f); } void XFade::process(const ProcessArgs& args) { diff --git a/src/analyzer_base.cpp b/src/analyzer_base.cpp @@ -138,7 +138,7 @@ void AnalyzerCore::resetChannels() { } SpectrumAnalyzer::Size AnalyzerCore::size() { - if (engineGetSampleRate() < 96000.0f) { + if (APP->engine->getSampleRate() < 96000.0f) { switch (_quality) { case QUALITY_ULTRA: { return SpectrumAnalyzer::SIZE_8192; @@ -191,7 +191,7 @@ void AnalyzerCore::stepChannel(int channelIndex, Input& input) { size(), _overlap, window(), - engineGetSampleRate(), + APP->engine->getSampleRate(), _averageN, _binAverageN ); @@ -254,7 +254,7 @@ void AnalyzerDisplay::drawHeader(const DrawArgs& args) { char s[sLen]; int x = _insetAround + 2; - int n = snprintf(s, sLen, "Peaks (+/-%0.1f):", (engineGetSampleRate() / 2.0f) / (float)(_module->_core.size() / _module->_core._binAverageN)); + int n = snprintf(s, sLen, "Peaks (+/-%0.1f):", (APP->engine->getSampleRate() / 2.0f) / (float)(_module->_core.size() / _module->_core._binAverageN)); drawText(args.vg, s, x, _insetTop + textY); x += n * charPx - 0; @@ -439,9 +439,9 @@ void AnalyzerDisplay::drawXAxisLine(const DrawArgs& args, float hz) { } void AnalyzerDisplay::drawGraph(const DrawArgs& args, const float* bins, int binsN, NVGcolor color, float strokeWidth) { - float range = (_module->_rangeMaxHz - _module->_rangeMinHz) / (0.5f * engineGetSampleRate()); + float range = (_module->_rangeMaxHz - _module->_rangeMinHz) / (0.5f * APP->engine->getSampleRate()); int pointsN = roundf(range * (_module->_core.size() / 2)); - range = _module->_rangeMinHz / (0.5f * engineGetSampleRate()); + range = _module->_rangeMinHz / (0.5f * APP->engine->getSampleRate()); int pointsOffset = roundf(range * (_module->_core.size() / 2)); nvgSave(args.vg); nvgScissor(args.vg, _insetLeft, _insetTop, _graphSize.x, _graphSize.y); diff --git a/src/dadsrh_core.cpp b/src/dadsrh_core.cpp @@ -207,7 +207,7 @@ void DADSRHCore::process(const ProcessArgs& args) { if (complete) { _triggerOuptutPulseGen.trigger(0.001); } - _triggerOutput.value = _triggerOuptutPulseGen.process(engineGetSampleTime()) ? 5.0 : 0.0; + _triggerOutput.value = _triggerOuptutPulseGen.process(APP->engine->getSampleTime()) ? 5.0 : 0.0; if (_delayOutput) { _delayOutput->value = _stage == DELAY_STAGE ? 5.0 : 0.0; @@ -245,7 +245,7 @@ void DADSRHCore::process(const ProcessArgs& args) { } float DADSRHCore::stepAmount(const Param& knob, const Input* cv, bool slow, bool allowZero) { - return engineGetSampleTime() / knobTime(knob, cv, slow, allowZero); + return APP->engine->getSampleTime() / knobTime(knob, cv, slow, allowZero); } float DADSRHCore::knobTime(const Param& knob, const Input* cv, bool slow, bool allowZero) { diff --git a/src/shaper_core.cpp b/src/shaper_core.cpp @@ -93,7 +93,7 @@ void ShaperCore::process(const ProcessArgs& args) { if (complete) { _triggerOuptutPulseGen.trigger(0.001); } - _triggerOutput.value = _triggerOuptutPulseGen.process(engineGetSampleTime()) ? 5.0 : 0.0; + _triggerOutput.value = _triggerOuptutPulseGen.process(APP->engine->getSampleTime()) ? 5.0 : 0.0; if (_attackOutput) { _attackOutput->value = _stage == ATTACK_STAGE ? 5.0 : 0.0; @@ -121,7 +121,7 @@ bool ShaperCore::stepStage(const Param& knob, const Input* cv, bool slow) { t = pow(t, 2); t = fmaxf(t, 0.001); t *= slow ? 100.0 : 10.0; - _stageProgress += engineGetSampleTime() / t; + _stageProgress += APP->engine->getSampleTime() / t; return _stageProgress > 1.0; }