commit 8a4ad99d72b9ff80b408869093c02b6f869082d5 parent 1ad3063ad94b61de9aa55318fff7d38b6cca0229 Author: Matt Demanett <matt@demanett.net> Date: Sat, 18 May 2019 18:00:24 -0400 v1: step -> process. Diffstat:
121 files changed, 121 insertions(+), 121 deletions(-)
diff --git a/src/AD.cpp b/src/AD.cpp @@ -17,7 +17,7 @@ void AD::onSampleRateChange() { _modulationStep = modulationSteps; } -void AD::step() { +void AD::process(const ProcessArgs& args) { lights[LOOP_LIGHT].value = _loopMode = params[LOOP_PARAM].value > 0.5f; lights[LINEAR_LIGHT].value = _linearMode = params[LINEAR_PARAM].value > 0.5f; if (!(outputs[ENV_OUTPUT].active || outputs[EOC_OUTPUT].active || inputs[TRIGGER_INPUT].active)) { diff --git a/src/AD.hpp b/src/AD.hpp @@ -60,7 +60,7 @@ struct AD : Module { void onReset() override; void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/ADSR.cpp b/src/ADSR.cpp @@ -12,7 +12,7 @@ void ADSR::onSampleRateChange() { _modulationStep = modulationSteps; } -void ADSR::step() { +void ADSR::process(const ProcessArgs& args) { lights[LINEAR_LIGHT].value = _linearMode = params[LINEAR_PARAM].value > 0.5f; if (!(outputs[OUT_OUTPUT].active || inputs[GATE_INPUT].active)) { return; diff --git a/src/ADSR.hpp b/src/ADSR.hpp @@ -49,7 +49,7 @@ struct ADSR : Module { void onReset() override; void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/AMRM.cpp b/src/AMRM.cpp @@ -1,7 +1,7 @@ #include "AMRM.hpp" -void AMRM::step() { +void AMRM::process(const ProcessArgs& args) { if (!(outputs[OUT_OUTPUT].active || outputs[RECTIFY_OUTPUT].active)) { return; } diff --git a/src/AMRM.hpp b/src/AMRM.hpp @@ -39,7 +39,7 @@ struct AMRM : Module { AMRM() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) { } - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Additator.cpp b/src/Additator.cpp @@ -43,7 +43,7 @@ float Additator::cvValue(Input& cv, bool dc) { return clamp(cv.value / 5.0f, -1.0f, 1.0f); } -void Additator::step() { +void Additator::process(const ProcessArgs& args) { if (!outputs[AUDIO_OUTPUT].active) { Phase phase = params[PHASE_PARAM].value > 1.5f ? PHASE_COSINE : PHASE_SINE; lights[SINE_LIGHT].value = phase == PHASE_SINE; diff --git a/src/Additator.hpp b/src/Additator.hpp @@ -93,7 +93,7 @@ struct Additator : Module { void onReset() override; void onSampleRateChange() override; float cvValue(Input& cv, bool dc = false); - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/AddrSeq.cpp b/src/AddrSeq.cpp @@ -26,7 +26,7 @@ void AddrSeq::dataFromJson(json_t* root) { } } -void AddrSeq::step() { +void AddrSeq::process(const ProcessArgs& args) { bool reset = _reset.process(inputs[RESET_INPUT].value); if (reset) { _timer.reset(); diff --git a/src/AddrSeq.hpp b/src/AddrSeq.hpp @@ -65,7 +65,7 @@ struct AddrSeq : Module { void onSampleRateChange() override; json_t* dataToJson() override; void dataFromJson(json_t* root) override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Analyzer.cpp b/src/Analyzer.cpp @@ -26,7 +26,7 @@ void Analyzer::dataFromJson(json_t* root) { } } -void Analyzer::step() { +void Analyzer::process(const ProcessArgs& args) { ++_modulationStep; if (_modulationStep >= modulationSteps) { _modulationStep = 0; diff --git a/src/Analyzer.hpp b/src/Analyzer.hpp @@ -59,7 +59,7 @@ struct Analyzer : AnalyzerBase { void onSampleRateChange() override; json_t* dataToJson() override; void dataFromJson(json_t* root) override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/AnalyzerXL.cpp b/src/AnalyzerXL.cpp @@ -127,7 +127,7 @@ void AnalyzerXL::dataFromJson(json_t* root) { } } -void AnalyzerXL::step() { +void AnalyzerXL::process(const ProcessArgs& args) { ++_modulationStep; if (_modulationStep >= modulationSteps) { _modulationStep = 0; diff --git a/src/AnalyzerXL.hpp b/src/AnalyzerXL.hpp @@ -48,7 +48,7 @@ struct AnalyzerXL : AnalyzerBase { void setCoreParams(); json_t* dataToJson() override; void dataFromJson(json_t* root) override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Blank3.cpp b/src/Blank3.cpp @@ -5,7 +5,7 @@ void Blank3::onSampleRateChange() { _rms.setSampleRate(engineGetSampleRate()); } -void Blank3::step() { +void Blank3::process(const ProcessArgs& args) { if (inputs[IN_INPUT].active) { _level = _rms.next(inputs[IN_INPUT].value) / 5.0f; } diff --git a/src/Blank3.hpp b/src/Blank3.hpp @@ -35,7 +35,7 @@ struct Blank3 : Module { } void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Blank6.cpp b/src/Blank6.cpp @@ -5,7 +5,7 @@ void Blank6::onSampleRateChange() { _rms.setSampleRate(engineGetSampleRate()); } -void Blank6::step() { +void Blank6::process(const ProcessArgs& args) { if (inputs[IN_INPUT].active) { _level = _rms.next(inputs[IN_INPUT].value) / 5.0f; } diff --git a/src/Blank6.hpp b/src/Blank6.hpp @@ -35,7 +35,7 @@ struct Blank6 : Module { } void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Bool.cpp b/src/Bool.cpp @@ -1,7 +1,7 @@ #include "Bool.hpp" -void Bool::step() { +void Bool::process(const ProcessArgs& args) { bool a = inputs[A_INPUT].value > 1.0f; bool b = inputs[B_INPUT].value > 1.0f; outputs[AND_OUTPUT].value = a && b ? 5.0f : 0.0f; diff --git a/src/Bool.hpp b/src/Bool.hpp @@ -33,7 +33,7 @@ struct Bool : Module { Bool() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) { } - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/CVD.cpp b/src/CVD.cpp @@ -5,7 +5,7 @@ void CVD::onSampleRateChange() { _delay.setSampleRate(engineGetSampleRate()); } -void CVD::step() { +void CVD::process(const ProcessArgs& args) { float time = params[TIME_PARAM].value; if (inputs[TIME_INPUT].active) { time *= clamp(inputs[TIME_INPUT].value / 10.0f, 0.0f, 1.0f); diff --git a/src/CVD.hpp b/src/CVD.hpp @@ -44,7 +44,7 @@ struct CVD : Module { } void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Clpr.cpp b/src/Clpr.cpp @@ -5,7 +5,7 @@ void Clpr::onReset() { _modulationStep = modulationSteps; } -void Clpr::step() { +void Clpr::process(const ProcessArgs& args) { if (!(outputs[LEFT_OUTPUT].active || outputs[RIGHT_OUTPUT].active)) { return; } diff --git a/src/Clpr.hpp b/src/Clpr.hpp @@ -51,7 +51,7 @@ struct Clpr : Module { } void onReset() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Cmp.cpp b/src/Cmp.cpp @@ -6,7 +6,7 @@ void Cmp::onReset() { _windowState = LOW; } -void Cmp::step() { +void Cmp::process(const ProcessArgs& args) { if (!( outputs[GREATER_OUTPUT].active || outputs[LESS_OUTPUT].active || diff --git a/src/Cmp.hpp b/src/Cmp.hpp @@ -53,7 +53,7 @@ struct Cmp : Module { } void onReset() override; - void step() override; + void process(const ProcessArgs& args) override; void stepChannel( bool high, float highValue, diff --git a/src/DADSRH.hpp b/src/DADSRH.hpp @@ -122,7 +122,7 @@ struct DADSRH : TriggerOnLoadModule { _core.reset(); } - void step() override { + void process(const ProcessArgs& args) override { _core.step(); } diff --git a/src/DADSRHPlus.hpp b/src/DADSRHPlus.hpp @@ -133,7 +133,7 @@ struct DADSRHPlus : TriggerOnLoadModule { _core.reset(); } - void step() override { + void process(const ProcessArgs& args) override { _core.step(); } diff --git a/src/DGate.cpp b/src/DGate.cpp @@ -8,7 +8,7 @@ void DGate::onReset() { _stageProgress = 0.0; } -void DGate::step() { +void DGate::process(const ProcessArgs& args) { float envelope = 0.0; bool complete = false; if ( diff --git a/src/DGate.hpp b/src/DGate.hpp @@ -49,7 +49,7 @@ struct DGate : TriggerOnLoadModule { } void onReset() override; - void step() override; + void process(const ProcessArgs& args) override; bool stepStage(Param& knob); bool shouldTriggerOnNextLoad() override { return _stage != STOPPED_STAGE; diff --git a/src/Detune.cpp b/src/Detune.cpp @@ -1,7 +1,7 @@ #include "Detune.hpp" -void Detune::step() { +void Detune::process(const ProcessArgs& args) { if (!(outputs[OUT_PLUS_OUTPUT].active || outputs[OUT_MINUS_OUTPUT].active || outputs[THRU_OUTPUT].active)) { return; } diff --git a/src/Detune.hpp b/src/Detune.hpp @@ -40,7 +40,7 @@ struct Detune : Module { Detune() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) { } - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/EightFO.cpp b/src/EightFO.cpp @@ -22,7 +22,7 @@ void EightFO::onSampleRateChange() { _sampleStep = _phasor._sampleRate; } -void EightFO::step() { +void EightFO::process(const ProcessArgs& args) { lights[SLOW_LIGHT].value = _slowMode = params[SLOW_PARAM].value > 0.5f; if (!( outputs[PHASE7_OUTPUT].active || diff --git a/src/EightFO.hpp b/src/EightFO.hpp @@ -123,7 +123,7 @@ struct EightFO : LFOBase { void onReset() override; void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; Phasor::phase_delta_t phaseOffset(Param& p, Input& i, Phasor::phase_delta_t baseOffset); void updateOutput(bool useSample, Output& output, Phasor::phase_delta_t& offset, float& sample, bool& active); }; diff --git a/src/EightOne.cpp b/src/EightOne.cpp @@ -26,7 +26,7 @@ void EightOne::dataFromJson(json_t* root) { } } -void EightOne::step() { +void EightOne::process(const ProcessArgs& args) { bool reset = _reset.process(inputs[RESET_INPUT].value); if (reset) { _timer.reset(); diff --git a/src/EightOne.hpp b/src/EightOne.hpp @@ -65,7 +65,7 @@ struct EightOne : Module { void onSampleRateChange() override; json_t* dataToJson() override; void dataFromJson(json_t* root) override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/FMOp.cpp b/src/FMOp.cpp @@ -36,7 +36,7 @@ void FMOp::dataFromJson(json_t* root) { } } -void FMOp::step() { +void FMOp::process(const ProcessArgs& args) { if (!outputs[AUDIO_OUTPUT].active) { lights[ENV_TO_LEVEL_LIGHT].value = params[ENV_TO_LEVEL_PARAM].value > 0.5f; lights[ENV_TO_FEEDBACK_LIGHT].value = params[ENV_TO_FEEDBACK_PARAM].value > 0.5f; diff --git a/src/FMOp.hpp b/src/FMOp.hpp @@ -92,7 +92,7 @@ struct FMOp : Module { void onSampleRateChange() override; json_t* dataToJson() override; void dataFromJson(json_t* root) override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/FlipFlop.cpp b/src/FlipFlop.cpp @@ -10,7 +10,7 @@ void FlipFlop::onReset() { _resetTrigger2.reset(); } -void FlipFlop::step() { +void FlipFlop::process(const ProcessArgs& args) { channelStep( inputs[IN1_INPUT], inputs[RESET1_INPUT], diff --git a/src/FlipFlop.hpp b/src/FlipFlop.hpp @@ -46,7 +46,7 @@ struct FlipFlop : Module { } void onReset() override; - void step() override; + void process(const ProcessArgs& args) override; void channelStep( Input& triggerInput, Input& resetInput, diff --git a/src/Follow.cpp b/src/Follow.cpp @@ -5,7 +5,7 @@ void Follow::onSampleRateChange() { _rms.setSampleRate(engineGetSampleRate()); } -void Follow::step() { +void Follow::process(const ProcessArgs& args) { if (inputs[IN_INPUT].active && outputs[OUT_OUTPUT].active) { float response = params[RESPONSE_PARAM].value; if (inputs[RESPONSE_INPUT].active) { diff --git a/src/Follow.hpp b/src/Follow.hpp @@ -42,7 +42,7 @@ struct Follow : Module { } void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/LFO.cpp b/src/LFO.cpp @@ -13,7 +13,7 @@ void LFO::onSampleRateChange() { _sampleStep = _phasor._sampleRate; } -void LFO::step() { +void LFO::process(const ProcessArgs& args) { lights[SLOW_LIGHT].value = _slowMode = params[SLOW_PARAM].value > 0.5f; if (!( outputs[SINE_OUTPUT].active || diff --git a/src/LFO.hpp b/src/LFO.hpp @@ -80,7 +80,7 @@ struct LFO : LFOBase { void onReset() override; void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; void updateOutput(Phasor& wave, bool useSample, bool invert, Output& output, float& sample, bool& active); }; diff --git a/src/LLFO.cpp b/src/LLFO.cpp @@ -11,7 +11,7 @@ void LLFO::onSampleRateChange() { _modulationStep = modulationSteps; } -void LLFO::step() { +void LLFO::process(const ProcessArgs& args) { lights[SLOW_LIGHT].value = _slowMode = params[SLOW_PARAM].value > 0.5f; Wave wave = (Wave)params[WAVE_PARAM].value; diff --git a/src/LLFO.hpp b/src/LLFO.hpp @@ -79,7 +79,7 @@ struct LLFO : LFOBase { void onReset() override; void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Lag.cpp b/src/Lag.cpp @@ -5,7 +5,7 @@ void Lag::onReset() { _modulationStep = modulationSteps; } -void Lag::step() { +void Lag::process(const ProcessArgs& args) { if (!(inputs[IN_INPUT].active && outputs[OUT_OUTPUT].active)) { return; } diff --git a/src/Lag.hpp b/src/Lag.hpp @@ -42,7 +42,7 @@ struct Lag : Module { } void onReset() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Lmtr.cpp b/src/Lmtr.cpp @@ -13,7 +13,7 @@ void Lmtr::onSampleRateChange() { _modulationStep = modulationSteps; } -void Lmtr::step() { +void Lmtr::process(const ProcessArgs& args) { if (!(outputs[LEFT_OUTPUT].active || outputs[RIGHT_OUTPUT].active)) { return; } diff --git a/src/Lmtr.hpp b/src/Lmtr.hpp @@ -57,7 +57,7 @@ struct Lmtr : Module { void onReset() override; void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Manual.cpp b/src/Manual.cpp @@ -6,7 +6,7 @@ void Manual::onReset() { _pulse.process(10.0f); } -void Manual::step() { +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); diff --git a/src/Manual.hpp b/src/Manual.hpp @@ -42,7 +42,7 @@ struct Manual : TriggerOnLoadModule { } void onReset() override; - void step() override; + void process(const ProcessArgs& args) override; bool shouldTriggerOnNextLoad() override { return true; } diff --git a/src/Matrix88.cpp b/src/Matrix88.cpp @@ -1,7 +1,7 @@ #include "Matrix88.hpp" -void Matrix88::step() { +void Matrix88::process(const ProcessArgs& args) { for (int i = 0; i < 8; ++i) { int paramOffset = MIX11_PARAM + i * 8; float out = 0.0f; diff --git a/src/Matrix88.hpp b/src/Matrix88.hpp @@ -112,7 +112,7 @@ struct Matrix88 : Module { Matrix88() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) { } - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Mix1.cpp b/src/Mix1.cpp @@ -5,7 +5,7 @@ void Mix1::onSampleRateChange() { _channel.setSampleRate(engineGetSampleRate()); } -void Mix1::step() { +void Mix1::process(const ProcessArgs& args) { _channel.next(false, false); outputs[OUT_OUTPUT].value = _channel.out; } diff --git a/src/Mix1.hpp b/src/Mix1.hpp @@ -52,7 +52,7 @@ struct Mix1 : Module { } void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Mix4.cpp b/src/Mix4.cpp @@ -11,7 +11,7 @@ void Mix4::onSampleRateChange() { _rms.setSampleRate(sr); } -void Mix4::step() { +void Mix4::process(const ProcessArgs& args) { bool stereo = outputs[L_OUTPUT].active && outputs[R_OUTPUT].active; bool solo = params[MUTE1_PARAM].value > 1.5f || diff --git a/src/Mix4.hpp b/src/Mix4.hpp @@ -78,7 +78,7 @@ struct Mix4 : Module { } void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Mix8.cpp b/src/Mix8.cpp @@ -15,7 +15,7 @@ void Mix8::onSampleRateChange() { _rms.setSampleRate(sr); } -void Mix8::step() { +void Mix8::process(const ProcessArgs& args) { bool stereo = outputs[L_OUTPUT].active && outputs[R_OUTPUT].active; bool solo = params[MUTE1_PARAM].value > 1.5f || diff --git a/src/Mix8.hpp b/src/Mix8.hpp @@ -110,7 +110,7 @@ struct Mix8 : Module { } void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Mult.cpp b/src/Mult.cpp @@ -1,7 +1,7 @@ #include "Mult.hpp" -void Mult::step() { +void Mult::process(const ProcessArgs& args) { float out = inputs[INA_INPUT].value; outputs[OUTA1_OUTPUT].value = out; outputs[OUTA2_OUTPUT].value = out; diff --git a/src/Mult.hpp b/src/Mult.hpp @@ -34,7 +34,7 @@ struct Mult : Module { Mult() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) { } - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Mute8.cpp b/src/Mute8.cpp @@ -19,7 +19,7 @@ void Mute8::onSampleRateChange() { } } -void Mute8::step() { +void Mute8::process(const ProcessArgs& args) { bool solo = false; for (int i = 0; i < 8; ++i) { solo = solo || params[MUTE1_PARAM + i].value > 1.5f; diff --git a/src/Mute8.hpp b/src/Mute8.hpp @@ -81,7 +81,7 @@ struct Mute8 : Module { void onReset() override; void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; void stepChannel(int i, bool solo); }; diff --git a/src/Noise.cpp b/src/Noise.cpp @@ -1,7 +1,7 @@ #include "Noise.hpp" -void Noise::step() { +void Noise::process(const ProcessArgs& args) { if (outputs[BLUE_OUTPUT].active) { outputs[BLUE_OUTPUT].value = clamp(_blue.next() * 20.0f, -10.0f, 10.f); } diff --git a/src/Noise.hpp b/src/Noise.hpp @@ -41,7 +41,7 @@ struct Noise : Module { Noise() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) {} - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Nsgt.cpp b/src/Nsgt.cpp @@ -13,7 +13,7 @@ void Nsgt::onSampleRateChange() { _modulationStep = modulationSteps; } -void Nsgt::step() { +void Nsgt::process(const ProcessArgs& args) { if (!(outputs[LEFT_OUTPUT].active || outputs[RIGHT_OUTPUT].active)) { return; } diff --git a/src/Nsgt.hpp b/src/Nsgt.hpp @@ -57,7 +57,7 @@ struct Nsgt : Module { void onReset() override; void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Offset.cpp b/src/Offset.cpp @@ -1,7 +1,7 @@ #include "Offset.hpp" -void Offset::step() { +void Offset::process(const ProcessArgs& args) { float offset = knobValue(params[OFFSET_PARAM], inputs[OFFSET_INPUT]); float scale = knobValue(params[SCALE_PARAM], inputs[SCALE_INPUT]); scale = scale < 0.0f ? -pow(scale, 2.0f) : pow(scale, 2.0f); diff --git a/src/Offset.hpp b/src/Offset.hpp @@ -28,7 +28,7 @@ struct Offset : DisableOutputLimitModule { Offset() : DisableOutputLimitModule(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS) {} - void step() override; + void process(const ProcessArgs& args) override; float knobValue(const Param& knob, const Input& cv) const; }; diff --git a/src/OneEight.cpp b/src/OneEight.cpp @@ -26,7 +26,7 @@ void OneEight::dataFromJson(json_t* root) { } } -void OneEight::step() { +void OneEight::process(const ProcessArgs& args) { bool reset = _reset.process(inputs[RESET_INPUT].value); if (reset) { _timer.reset(); diff --git a/src/OneEight.hpp b/src/OneEight.hpp @@ -65,7 +65,7 @@ struct OneEight : Module { void onSampleRateChange() override; json_t* dataToJson() override; void dataFromJson(json_t* root) override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Pan.cpp b/src/Pan.cpp @@ -7,7 +7,7 @@ void Pan::onSampleRateChange() { _slew2.setParams(engineGetSampleRate(), MixerChannel::panSlewTimeMS, 2.0f); } -void Pan::step() { +void Pan::process(const ProcessArgs& args) { if (!((inputs[IN1_INPUT].active || inputs[IN2_INPUT].active) && (outputs[L_OUTPUT].active || outputs[R_OUTPUT].active))) { return; } diff --git a/src/Pan.hpp b/src/Pan.hpp @@ -46,7 +46,7 @@ struct Pan : Module { } void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Pressor.cpp b/src/Pressor.cpp @@ -10,7 +10,7 @@ void Pressor::onSampleRateChange() { _modulationStep = modulationSteps; } -void Pressor::step() { +void Pressor::process(const ProcessArgs& args) { if (!( outputs[LEFT_OUTPUT].active || outputs[RIGHT_OUTPUT].active || diff --git a/src/Pressor.hpp b/src/Pressor.hpp @@ -82,7 +82,7 @@ struct Pressor : Module { void onReset() override; void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Reftone.cpp b/src/Reftone.cpp @@ -1,7 +1,7 @@ #include "Reftone.hpp" -void Reftone::step() { +void Reftone::process(const ProcessArgs& args) { // C4 -- the pitch.hpp reference frequency -- in knob values: const int referencePitch = 0; const int referenceOctave = 4; diff --git a/src/Reftone.hpp b/src/Reftone.hpp @@ -47,7 +47,7 @@ struct Reftone : Module { _sine.setSampleRate(engineGetSampleRate()); } - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/SampleHold.cpp b/src/SampleHold.cpp @@ -8,7 +8,7 @@ void SampleHold::onReset() { _value2 = 0.0f; } -void SampleHold::step() { +void SampleHold::process(const ProcessArgs& args) { { lights[TRACK1_LIGHT].value = params[TRACK1_PARAM].value; bool triggered = _trigger1.process(params[TRIGGER1_PARAM].value + inputs[TRIGGER1_INPUT].value); diff --git a/src/SampleHold.hpp b/src/SampleHold.hpp @@ -51,7 +51,7 @@ struct SampleHold : Module { } void onReset() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Shaper.hpp b/src/Shaper.hpp @@ -96,7 +96,7 @@ struct Shaper : TriggerOnLoadModule { _core.reset(); } - void step() override { + void process(const ProcessArgs& args) override { _core.step(); } diff --git a/src/ShaperPlus.hpp b/src/ShaperPlus.hpp @@ -103,7 +103,7 @@ struct ShaperPlus : TriggerOnLoadModule { _core.reset(); } - void step() override { + void process(const ProcessArgs& args) override { _core.step(); } diff --git a/src/Slew.cpp b/src/Slew.cpp @@ -5,7 +5,7 @@ void Slew::onReset() { _modulationStep = modulationSteps; } -void Slew::step() { +void Slew::process(const ProcessArgs& args) { if (!(inputs[IN_INPUT].active && outputs[OUT_OUTPUT].active)) { return; } diff --git a/src/Slew.hpp b/src/Slew.hpp @@ -46,7 +46,7 @@ struct Slew : Module { } void onReset() override; - void step() override; + void process(const ProcessArgs& args) override; float time(Param& param, Input& input); float shape(Param& param); }; diff --git a/src/Stack.cpp b/src/Stack.cpp @@ -1,7 +1,7 @@ #include "Stack.hpp" -void Stack::step() { +void Stack::process(const ProcessArgs& args) { lights[QUANTIZE_LIGHT].value = params[QUANTIZE_PARAM].value > 0.5; if (!(outputs[OUT_OUTPUT].active || outputs[THRU_OUTPUT].active)) { return; diff --git a/src/Stack.hpp b/src/Stack.hpp @@ -46,7 +46,7 @@ struct Stack : Module { Stack() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) { } - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Sums.cpp b/src/Sums.cpp @@ -1,7 +1,7 @@ #include "Sums.hpp" -void Sums::step() { +void Sums::process(const ProcessArgs& args) { float a = inputs[A_INPUT].value; float b = inputs[B_INPUT].value; if (_disableOutputLimit) { diff --git a/src/Sums.hpp b/src/Sums.hpp @@ -35,7 +35,7 @@ struct Sums : DisableOutputLimitModule { Sums() : DisableOutputLimitModule(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) { } - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Switch.hpp b/src/Switch.hpp @@ -41,7 +41,7 @@ struct Switch : Module { } void onReset() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Test.cpp b/src/Test.cpp @@ -4,7 +4,7 @@ void Test::onReset() { } -void Test::step() { +void Test::process(const ProcessArgs& args) { if (!(outputs[OUT_OUTPUT].active || outputs[OUT2_OUTPUT].active)) { return; } diff --git a/src/Test.hpp b/src/Test.hpp @@ -329,7 +329,7 @@ struct Test : Module { } void onReset() override; - void step() override; + void process(const ProcessArgs& args) override; float oscillatorPitch(float max = 10000.0); float oscillatorPitch2(float max = 10000.0); float ratio2(); diff --git a/src/Test2.cpp b/src/Test2.cpp @@ -8,7 +8,7 @@ void Test2::onReset() { } -void Test2::step() { +void Test2::process(const ProcessArgs& args) { if (!outputs[OUT_OUTPUT].active) { return; } diff --git a/src/Test2.hpp b/src/Test2.hpp @@ -74,7 +74,7 @@ struct Test2 : Module { } void onReset() override; - void step() override; + void process(const ProcessArgs& args) override; // float oscillatorPitch1A(); }; diff --git a/src/UMix.cpp b/src/UMix.cpp @@ -23,7 +23,7 @@ void UMix::dataFromJson(json_t* root) { } } -void UMix::step() { +void UMix::process(const ProcessArgs& args) { if (!outputs[OUT_OUTPUT].active) { return; } diff --git a/src/UMix.hpp b/src/UMix.hpp @@ -45,7 +45,7 @@ struct UMix : Module { json_t* dataToJson() override; void dataFromJson(json_t* root) override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/VCA.cpp b/src/VCA.cpp @@ -7,7 +7,7 @@ void VCA::onSampleRateChange() { _levelSL2.setParams(sampleRate, 5.0f, 1.0f); } -void VCA::step() { +void VCA::process(const ProcessArgs& args) { bool linear = params[LINEAR_PARAM].value > 0.5f; lights[LINEAR_LIGHT].value = linear; channelStep(inputs[IN1_INPUT], outputs[OUT1_OUTPUT], params[LEVEL1_PARAM], inputs[CV1_INPUT], _amplifier1, _levelSL1, linear); diff --git a/src/VCA.hpp b/src/VCA.hpp @@ -46,7 +46,7 @@ struct VCA : Module { } void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; void channelStep(Input& input, Output& output, Param& knob, Input& cv, Amplifier& amplifier, bogaudio::dsp::SlewLimiter& levelSL, bool linear); }; diff --git a/src/VCAmp.cpp b/src/VCAmp.cpp @@ -11,7 +11,7 @@ void VCAmp::onSampleRateChange() { _rms.setSampleRate(sampleRate); } -void VCAmp::step() { +void VCAmp::process(const ProcessArgs& args) { if (inputs[IN_INPUT].active) { float level = params[LEVEL_PARAM].value; if (inputs[CV_INPUT].active) { diff --git a/src/VCAmp.hpp b/src/VCAmp.hpp @@ -42,7 +42,7 @@ struct VCAmp : Module { } void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/VCM.cpp b/src/VCM.cpp @@ -1,7 +1,7 @@ #include "VCM.hpp" -void VCM::step() { +void VCM::process(const ProcessArgs& args) { bool linear = params[LINEAR_PARAM].value > 0.5f; lights[LINEAR_LIGHT].value = linear; if (outputs[MIX_OUTPUT].active) { diff --git a/src/VCM.hpp b/src/VCM.hpp @@ -53,7 +53,7 @@ struct VCM : DisableOutputLimitModule { onReset(); } - void step() override; + void process(const ProcessArgs& args) override; float channelStep(Input& input, Param& knob, Input& cv, Amplifier& amplifier, bool linear); }; diff --git a/src/VCO.cpp b/src/VCO.cpp @@ -12,7 +12,7 @@ void VCO::onSampleRateChange() { _modulationStep = modulationSteps; } -void VCO::step() { +void VCO::process(const ProcessArgs& args) { lights[SLOW_LIGHT].value = _slowMode = params[SLOW_PARAM].value > 0.5f; _fmLinearMode = params[FM_TYPE_PARAM].value < 0.5f; diff --git a/src/VCO.hpp b/src/VCO.hpp @@ -78,7 +78,7 @@ struct VCO : Module { void onReset() override; void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; void setSampleRate(float sampleRate); void setFrequency(float frequency); }; diff --git a/src/VU.cpp b/src/VU.cpp @@ -6,7 +6,7 @@ void VU::onSampleRateChange() { _rRms.setSampleRate(engineGetSampleRate()); } -void VU::step() { +void VU::process(const ProcessArgs& args) { float left = 0.0f; float right = 0.0f; if (inputs[L_INPUT].active) { diff --git a/src/VU.hpp b/src/VU.hpp @@ -42,7 +42,7 @@ struct VU : Module { } void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Walk.cpp b/src/Walk.cpp @@ -11,7 +11,7 @@ void Walk::onSampleRateChange() { _slew.setParams(engineGetSampleRate(), 100.0f, 10.0f); } -void Walk::step() { +void Walk::process(const ProcessArgs& args) { ++_modulationStep; if (_modulationStep >= modulationSteps) { _modulationStep = 0; diff --git a/src/Walk.hpp b/src/Walk.hpp @@ -49,7 +49,7 @@ struct Walk : Module { void onReset() override; void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/Walk2.cpp b/src/Walk2.cpp @@ -42,7 +42,7 @@ inline float scaleRate(float rate) { return 0.2f * powf(rate, 5.0f); } -void Walk2::step() { +void Walk2::process(const ProcessArgs& args) { ++_modulationStep; if (_modulationStep >= modulationSteps) { _modulationStep = 0; diff --git a/src/Walk2.hpp b/src/Walk2.hpp @@ -86,7 +86,7 @@ struct Walk2 : Module { void onSampleRateChange() override; json_t* dataToJson() override; void dataFromJson(json_t* root) override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/XCO.cpp b/src/XCO.cpp @@ -12,7 +12,7 @@ void XCO::onSampleRateChange() { _modulationStep = modulationSteps; } -void XCO::step() { +void XCO::process(const ProcessArgs& args) { lights[SLOW_LIGHT].value = _slowMode = params[SLOW_PARAM].value > 0.5f; _fmLinearMode = params[FM_TYPE_PARAM].value < 0.5f; diff --git a/src/XCO.hpp b/src/XCO.hpp @@ -126,7 +126,7 @@ struct XCO : Module { void onReset() override; void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; Phasor::phase_delta_t phaseOffset(Param& param, Input& input); float level(Param& param, Input& input); void setSampleRate(float sampleRate); diff --git a/src/XFade.cpp b/src/XFade.cpp @@ -5,7 +5,7 @@ void XFade::onSampleRateChange() { _mixSL.setParams(engineGetSampleRate(), 10.0f, 2.0f); } -void XFade::step() { +void XFade::process(const ProcessArgs& args) { bool linear = params[LINEAR_PARAM].value > 0.5f; lights[LINEAR_LIGHT].value = linear; if (!outputs[OUT_OUTPUT].active) { diff --git a/src/XFade.hpp b/src/XFade.hpp @@ -45,7 +45,7 @@ struct XFade : Module { } void onSampleRateChange() override; - void step() override; + void process(const ProcessArgs& args) override; }; } // namespace bogaudio diff --git a/src/dadsrh_core.cpp b/src/dadsrh_core.cpp @@ -8,7 +8,7 @@ void DADSRHCore::reset() { _releaseLevel = _holdProgress = _stageProgress = _envelope = 0.0; } -void DADSRHCore::step() { +void DADSRHCore::process(const ProcessArgs& args) { const int SHAPE1 = 1; const int SHAPE2 = 2; const int SHAPE3 = 3; diff --git a/src/dadsrh_core.hpp b/src/dadsrh_core.hpp @@ -173,7 +173,7 @@ struct DADSRHCore { } void reset(); - void step(); + void process(const ProcessArgs& args); float stepAmount(const Param& knob, const Input* cv, bool slow, bool allowZero = false); float knobTime(const Param& knob, const Input* cv, bool slow, bool allowZero = false); diff --git a/src/mixer.cpp b/src/mixer.cpp @@ -69,7 +69,7 @@ SoloMuteButton::SoloMuteButton() { shadow->box.pos = Vec(0.0, 1.0); } -void SoloMuteButton::step() { +void SoloMuteButton::process(const ProcessArgs& args) { // FIXME.v1 FramebufferWidget::step(); } diff --git a/src/mixer.hpp b/src/mixer.hpp @@ -71,7 +71,7 @@ struct SoloMuteButton : ParamWidget /*FIXME.v1 , FramebufferWidget*/ { CircularShadow* shadow = NULL; SoloMuteButton(); - void step() override; + void process(const ProcessArgs& args) override; void onButton(const event::Button& e) override; void onChange(const event::Change& e) override; }; diff --git a/src/shaper_core.cpp b/src/shaper_core.cpp @@ -8,7 +8,7 @@ void ShaperCore::reset() { _stageProgress = 0.0; } -void ShaperCore::step() { +void ShaperCore::process(const ProcessArgs& args) { bool complete = false; bool slow = _speedParam.value <= 0.0; if ( diff --git a/src/shaper_core.hpp b/src/shaper_core.hpp @@ -130,7 +130,7 @@ struct ShaperCore { } void reset(); - void step(); + void process(const ProcessArgs& args); bool stepStage(const Param& knob, const Input* cv, bool slow); float levelParam(const Param& knob, const Input* cv) const; diff --git a/src/widgets.cpp b/src/widgets.cpp @@ -100,7 +100,7 @@ StatefulButton::StatefulButton(const char* offSVGPath, const char* onSVGPath) { shadow->box.pos = Vec(0.0, 1.0); } -void StatefulButton::step() { +void StatefulButton::process(const ProcessArgs& args) { // FIXME.v1 FramebufferWidget::step(); } diff --git a/src/widgets.hpp b/src/widgets.hpp @@ -67,7 +67,7 @@ struct StatefulButton : ParamWidget /*, FramebufferWidget*/ { CircularShadow* shadow = NULL; StatefulButton(const char* offSVGPath, const char* onSVGPath); - void step() override; + void process(const ProcessArgs& args) override; void onDragStart(const event::DragStart& e) override; void onDragEnd(const event::DragEnd& e) override; };