commit a85404f21cb22089c6e414c653468c1287b77b02 parent 1b426eb0ffae84af399dbd0a4091e8a0a1fa0c0f Author: Matt Demanett <matt@demanett.net> Date: Wed, 27 Nov 2019 21:19:17 -0500 Rename (add|remove)Engine module methods. Diffstat:
44 files changed, 87 insertions(+), 87 deletions(-)
diff --git a/src/AD.cpp b/src/AD.cpp @@ -50,13 +50,13 @@ int AD::channels() { return std::max(1, inputs[TRIGGER_INPUT].getChannels()); } -void AD::addEngine(int c) { +void AD::addChannel(int c) { _engines[c] = new Engine(_modulationSteps); _engines[c]->reset(); _engines[c]->sampleRateChange(); } -void AD::removeEngine(int c) { +void AD::removeChannel(int c) { delete _engines[c]; _engines[c] = NULL; } diff --git a/src/AD.hpp b/src/AD.hpp @@ -79,8 +79,8 @@ struct AD : BGModule { void dataFromJson(json_t* root) override; bool active() override; int channels() override; - void addEngine(int c) override; - void removeEngine(int c) override; + void addChannel(int c) override; + void removeChannel(int c) override; void modulateChannel(int c) override; void always(const ProcessArgs& args) override; void processChannel(const ProcessArgs& args, int c) override; diff --git a/src/ADSR.cpp b/src/ADSR.cpp @@ -45,13 +45,13 @@ int ADSR::channels() { return inputs[GATE_INPUT].getChannels(); } -void ADSR::addEngine(int c) { +void ADSR::addChannel(int c) { _engines[c] = new Engine(); _engines[c]->reset(); _engines[c]->sampleRateChange(); } -void ADSR::removeEngine(int c) { +void ADSR::removeChannel(int c) { delete _engines[c]; _engines[c] = NULL; } diff --git a/src/ADSR.hpp b/src/ADSR.hpp @@ -72,8 +72,8 @@ struct ADSR : BGModule { void dataFromJson(json_t* root) override; bool active() override; int channels() override; - void addEngine(int c) override; - void removeEngine(int c) override; + void addChannel(int c) override; + void removeChannel(int c) override; void modulateChannel(int c) override; void always(const ProcessArgs& args) override; void processChannel(const ProcessArgs& args, int c) override; diff --git a/src/Additator.cpp b/src/Additator.cpp @@ -40,7 +40,7 @@ int Additator::channels() { return std::max(1, inputs[PITCH_INPUT].getChannels()); } -void Additator::addEngine(int c) { +void Additator::addChannel(int c) { Engine& e = *(_engines[c] = new Engine()); e.reset(); e.sampleRateChange(); @@ -59,7 +59,7 @@ void Additator::addEngine(int c) { } } -void Additator::removeEngine(int c) { +void Additator::removeChannel(int c) { delete _engines[c]; _engines[c] = NULL; } diff --git a/src/Additator.hpp b/src/Additator.hpp @@ -118,8 +118,8 @@ struct Additator : BGModule { void sampleRateChange() override; bool active() override; int channels() override; - void addEngine(int c) override; - void removeEngine(int c) override; + void addChannel(int c) override; + void removeChannel(int c) override; float widthParam(int c); float oddSkewParam(int c); float evenSkewParam(int c); diff --git a/src/CVD.cpp b/src/CVD.cpp @@ -15,12 +15,12 @@ int CVD::channels() { return inputs[IN_INPUT].getChannels(); } -void CVD::addEngine(int c) { +void CVD::addChannel(int c) { _engines[c] = new Engine(); _engines[c]->sampleRateChange(); } -void CVD::removeEngine(int c) { +void CVD::removeChannel(int c) { delete _engines[c]; _engines[c] = NULL; } diff --git a/src/CVD.hpp b/src/CVD.hpp @@ -52,8 +52,8 @@ struct CVD : BGModule { void sampleRateChange() override; int channels() override; - void addEngine(int c) override; - void removeEngine(int c) override; + void addChannel(int c) override; + void removeChannel(int c) override; void modulateChannel(int c) override; void processChannel(const ProcessArgs& args, int c) override; }; diff --git a/src/Clpr.cpp b/src/Clpr.cpp @@ -9,11 +9,11 @@ int Clpr::channels() { return std::max(inputs[LEFT_INPUT].getChannels(), inputs[RIGHT_INPUT].getChannels()); } -void Clpr::addEngine(int c) { +void Clpr::addChannel(int c) { _engines[c] = new Engine(); } -void Clpr::removeEngine(int c) { +void Clpr::removeChannel(int c) { delete _engines[c]; _engines[c] = NULL; } diff --git a/src/Clpr.hpp b/src/Clpr.hpp @@ -57,8 +57,8 @@ struct Clpr : BGModule { bool active() override; int channels() override; - void addEngine(int c) override; - void removeEngine(int c) override; + void addChannel(int c) override; + void removeChannel(int c) override; void modulate() override; void modulateChannel(int c) override; void processChannel(const ProcessArgs& args, int c) override; diff --git a/src/DADSRH.cpp b/src/DADSRH.cpp @@ -11,7 +11,7 @@ int DADSRH::channels() { return std::max(1, inputs[TRIGGER_INPUT].getChannels()); } -void DADSRH::addEngine(int c) { +void DADSRH::addChannel(int c) { _core[c] = new DADSRHCore( params[DELAY_PARAM], params[ATTACK_PARAM], @@ -65,7 +65,7 @@ void DADSRH::addEngine(int c) { ); } -void DADSRH::removeEngine(int c) { +void DADSRH::removeChannel(int c) { delete _core[c]; _core[c] = NULL; } diff --git a/src/DADSRH.hpp b/src/DADSRH.hpp @@ -84,8 +84,8 @@ struct DADSRH : TriggerOnLoadModule { void reset() override; int channels() override; - void addEngine(int c) override; - void removeEngine(int c) override; + void addChannel(int c) override; + void removeChannel(int c) override; void processChannel(const ProcessArgs& args, int c) override; void postProcess(const ProcessArgs& args) override; diff --git a/src/DADSRHPlus.cpp b/src/DADSRHPlus.cpp @@ -11,7 +11,7 @@ int DADSRHPlus::channels() { return std::max(1, inputs[TRIGGER_INPUT].getChannels()); } -void DADSRHPlus::addEngine(int c) { +void DADSRHPlus::addChannel(int c) { _core[c] = new DADSRHCore( params[DELAY_PARAM], params[ATTACK_PARAM], @@ -65,7 +65,7 @@ void DADSRHPlus::addEngine(int c) { ); } -void DADSRHPlus::removeEngine(int c) { +void DADSRHPlus::removeChannel(int c) { delete _core[c]; _core[c] = NULL; } diff --git a/src/DADSRHPlus.hpp b/src/DADSRHPlus.hpp @@ -95,8 +95,8 @@ struct DADSRHPlus : TriggerOnLoadModule { void reset() override; int channels() override; - void addEngine(int c) override; - void removeEngine(int c) override; + void addChannel(int c) override; + void removeChannel(int c) override; void processChannel(const ProcessArgs& args, int c) override; void postProcess(const ProcessArgs& args) override; diff --git a/src/DGate.cpp b/src/DGate.cpp @@ -20,12 +20,12 @@ int DGate::channels() { return std::max(1, inputs[TRIGGER_INPUT].getChannels()); } -void DGate::addEngine(int c) { +void DGate::addChannel(int c) { _engines[c] = new Engine(); _engines[c]->reset(); } -void DGate::removeEngine(int c) { +void DGate::removeChannel(int c) { delete _engines[c]; _engines[c] = NULL; } diff --git a/src/DGate.hpp b/src/DGate.hpp @@ -63,8 +63,8 @@ struct DGate : TriggerOnLoadModule { void reset() override; int channels() override; - void addEngine(int c) override; - void removeEngine(int c) override; + void addChannel(int c) override; + void removeChannel(int c) override; void processChannel(const ProcessArgs& args, int c) override; void postProcess(const ProcessArgs& args) override; bool stepStage(int c, Param& knob); diff --git a/src/EightFO.cpp b/src/EightFO.cpp @@ -49,7 +49,7 @@ int EightFO::channels() { return std::max(1, inputs[PITCH_INPUT].getChannels()); } -void EightFO::addEngine(int c) { +void EightFO::addChannel(int c) { _engines[c] = new Engine(); _engines[c]->reset(); _engines[c]->sampleRateChange(); @@ -58,7 +58,7 @@ void EightFO::addEngine(int c) { } } -void EightFO::removeEngine(int c) { +void EightFO::removeChannel(int c) { delete _engines[c]; _engines[c] = NULL; } diff --git a/src/EightFO.hpp b/src/EightFO.hpp @@ -140,8 +140,8 @@ struct EightFO : LFOBase { void sampleRateChange() override; bool active() override; int channels() override; - void addEngine(int c) override; - void removeEngine(int c) override; + void addChannel(int c) override; + void removeChannel(int c) override; void modulate() override; void modulateChannel(int c) override; void always(const ProcessArgs& args) override; diff --git a/src/FMOp.cpp b/src/FMOp.cpp @@ -87,7 +87,7 @@ int FMOp::channels() { return std::max(1, std::max(inputs[PITCH_INPUT].getChannels(), inputs[FM_INPUT].getChannels())); } -void FMOp::addEngine(int c) { +void FMOp::addChannel(int c) { _engines[c] = new Engine(); _engines[c]->reset(); _engines[c]->sampleRateChange(); @@ -96,7 +96,7 @@ void FMOp::addEngine(int c) { } } -void FMOp::removeEngine(int c) { +void FMOp::removeChannel(int c) { delete _engines[c]; _engines[c] = NULL; } diff --git a/src/FMOp.hpp b/src/FMOp.hpp @@ -119,8 +119,8 @@ struct FMOp : BGModule { void dataFromJson(json_t* root) override; bool active() override; int channels() override; - void addEngine(int c) override; - void removeEngine(int c) override; + void addChannel(int c) override; + void removeChannel(int c) override; void modulate() override; void modulateChannel(int c) override; void always(const ProcessArgs& args) override; diff --git a/src/Follow.cpp b/src/Follow.cpp @@ -15,12 +15,12 @@ int Follow::channels() { return inputs[IN_INPUT].getChannels(); } -void Follow::addEngine(int c) { +void Follow::addChannel(int c) { _rms[c] = new RootMeanSquare(1000.0f, 1.0f, 500.0f); _rms[c]->setSampleRate(APP->engine->getSampleRate()); } -void Follow::removeEngine(int c) { +void Follow::removeChannel(int c) { delete _rms[c]; _rms[c] = NULL; } diff --git a/src/Follow.hpp b/src/Follow.hpp @@ -44,8 +44,8 @@ struct Follow : BGModule { bool active() override; int channels() override; - void addEngine(int c) override; - void removeEngine(int c) override; + void addChannel(int c) override; + void removeChannel(int c) override; void sampleRateChange() override; void processChannel(const ProcessArgs& args, int c) override; }; diff --git a/src/LFO.cpp b/src/LFO.cpp @@ -37,7 +37,7 @@ int LFO::channels() { return std::max(1, inputs[PITCH_INPUT].getChannels()); } -void LFO::addEngine(int c) { +void LFO::addChannel(int c) { _engines[c] = new Engine(); _engines[c]->reset(); _engines[c]->sampleRateChange(); @@ -46,7 +46,7 @@ void LFO::addEngine(int c) { } } -void LFO::removeEngine(int c) { +void LFO::removeChannel(int c) { delete _engines[c]; _engines[c] = NULL; } diff --git a/src/LFO.hpp b/src/LFO.hpp @@ -89,8 +89,8 @@ struct LFO : LFOBase { void sampleRateChange() override; bool active() override; int channels() override; - void addEngine(int c) override; - void removeEngine(int c) override; + void addChannel(int c) override; + void removeChannel(int c) override; void modulateChannel(int c) override; void always(const ProcessArgs& args) override; void processChannel(const ProcessArgs& args, int c) override; diff --git a/src/LLFO.cpp b/src/LLFO.cpp @@ -21,7 +21,7 @@ int LLFO::channels() { return std::max(1, inputs[PITCH_INPUT].getChannels()); } -void LLFO::addEngine(int c) { +void LLFO::addChannel(int c) { if (c > 0) { _phasor[c].syncPhase(_phasor[0]); } diff --git a/src/LLFO.hpp b/src/LLFO.hpp @@ -83,7 +83,7 @@ struct LLFO : LFOBase { void sampleRateChange() override; bool active() override; int channels() override; - void addEngine(int c) override; + void addChannel(int c) override; void modulate() override; void modulateChannel(int c) override; void always(const ProcessArgs& args) override; diff --git a/src/Lmtr.cpp b/src/Lmtr.cpp @@ -22,12 +22,12 @@ int Lmtr::channels() { return std::max(inputs[LEFT_INPUT].getChannels(), inputs[RIGHT_INPUT].getChannels()); } -void Lmtr::addEngine(int c) { +void Lmtr::addChannel(int c) { _engines[c] = new Engine(); _engines[c]->sampleRateChange(); } -void Lmtr::removeEngine(int c) { +void Lmtr::removeChannel(int c) { delete _engines[c]; _engines[c] = NULL; } diff --git a/src/Lmtr.hpp b/src/Lmtr.hpp @@ -64,8 +64,8 @@ struct Lmtr : BGModule { void sampleRateChange() override; bool active() override; int channels() override; - void addEngine(int c) override; - void removeEngine(int c) override; + void addChannel(int c) override; + void removeChannel(int c) override; void modulate() override; void modulateChannel(int c) override; void processChannel(const ProcessArgs& args, int c) override; diff --git a/src/Mix1.cpp b/src/Mix1.cpp @@ -16,7 +16,7 @@ int Mix1::channels() { return inputs[IN_INPUT].getChannels(); } -void Mix1::addEngine(int c) { +void Mix1::addChannel(int c) { _engines[c] = new MixerChannel( params[LEVEL_PARAM], params[LEVEL_PARAM], // not used @@ -29,7 +29,7 @@ void Mix1::addEngine(int c) { _engines[c]->setSampleRate(APP->engine->getSampleRate()); } -void Mix1::removeEngine(int c) { +void Mix1::removeChannel(int c) { delete _engines[c]; _engines[c] = NULL; } diff --git a/src/Mix1.hpp b/src/Mix1.hpp @@ -46,8 +46,8 @@ struct Mix1 : BGModule { void sampleRateChange() override; bool active() override; int channels() override; - void addEngine(int c) override; - void removeEngine(int c) override; + void addChannel(int c) override; + void removeChannel(int c) override; void always(const ProcessArgs& args) override; void processChannel(const ProcessArgs& args, int c) override; void postProcess(const ProcessArgs& args) override; diff --git a/src/Nsgt.cpp b/src/Nsgt.cpp @@ -23,12 +23,12 @@ int Nsgt::channels() { return std::max(inputs[LEFT_INPUT].getChannels(), inputs[RIGHT_INPUT].getChannels()); } -void Nsgt::addEngine(int c) { +void Nsgt::addChannel(int c) { _engines[c] = new Engine(); _engines[c]->sampleRateChange(); } -void Nsgt::removeEngine(int c) { +void Nsgt::removeChannel(int c) { delete _engines[c]; _engines[c] = NULL; } diff --git a/src/Nsgt.hpp b/src/Nsgt.hpp @@ -64,8 +64,8 @@ struct Nsgt : BGModule { void sampleRateChange() override; bool active() override; int channels() override; - void addEngine(int c) override; - void removeEngine(int c) override; + void addChannel(int c) override; + void removeChannel(int c) override; void modulate() override; void modulateChannel(int c) override; void processChannel(const ProcessArgs& args, int _c) override; diff --git a/src/Pressor.cpp b/src/Pressor.cpp @@ -26,12 +26,12 @@ int Pressor::channels() { return std::max(inputs[LEFT_INPUT].getChannels(), inputs[RIGHT_INPUT].getChannels()); } -void Pressor::addEngine(int c) { +void Pressor::addChannel(int c) { _engines[c] = new Engine(); _engines[c]->sampleRateChange(); } -void Pressor::removeEngine(int c) { +void Pressor::removeChannel(int c) { delete _engines[c]; _engines[c] = NULL; } diff --git a/src/Pressor.hpp b/src/Pressor.hpp @@ -95,8 +95,8 @@ struct Pressor : BGModule { void sampleRateChange() override; bool active() override; int channels() override; - void addEngine(int c) override; - void removeEngine(int c) override; + void addChannel(int c) override; + void removeChannel(int c) override; void modulate() override; void modulateChannel(int c) override; void processChannel(const ProcessArgs& args, int c) override; diff --git a/src/Shaper.cpp b/src/Shaper.cpp @@ -11,7 +11,7 @@ int Shaper::channels() { return std::max(1, std::max(inputs[SIGNAL_INPUT].getChannels(), inputs[TRIGGER_INPUT].getChannels())); } -void Shaper::addEngine(int c) { +void Shaper::addChannel(int c) { _core[c] = new ShaperCore( params[ATTACK_PARAM], params[ON_PARAM], @@ -51,7 +51,7 @@ void Shaper::addEngine(int c) { ); } -void Shaper::removeEngine(int c) { +void Shaper::removeChannel(int c) { delete _core[c]; _core[c] = NULL; } diff --git a/src/Shaper.hpp b/src/Shaper.hpp @@ -65,8 +65,8 @@ struct Shaper : TriggerOnLoadModule { void reset() override; int channels() override; - void addEngine(int c) override; - void removeEngine(int c) override; + void addChannel(int c) override; + void removeChannel(int c) override; void processChannel(const ProcessArgs& args, int c) override; void postProcess(const ProcessArgs& args) override; diff --git a/src/ShaperPlus.cpp b/src/ShaperPlus.cpp @@ -11,7 +11,7 @@ int ShaperPlus::channels() { return std::max(1, std::max(inputs[SIGNAL_INPUT].getChannels(), inputs[TRIGGER_INPUT].getChannels())); } -void ShaperPlus::addEngine(int c) { +void ShaperPlus::addChannel(int c) { _core[c] = new ShaperCore( params[ATTACK_PARAM], params[ON_PARAM], @@ -51,7 +51,7 @@ void ShaperPlus::addEngine(int c) { ); } -void ShaperPlus::removeEngine(int c) { +void ShaperPlus::removeChannel(int c) { delete _core[c]; _core[c] = NULL; } diff --git a/src/ShaperPlus.hpp b/src/ShaperPlus.hpp @@ -75,8 +75,8 @@ struct ShaperPlus : TriggerOnLoadModule { void reset() override; int channels() override; - void addEngine(int c) override; - void removeEngine(int c) override; + void addChannel(int c) override; + void removeChannel(int c) override; void processChannel(const ProcessArgs& args, int c) override; void postProcess(const ProcessArgs& args) override; diff --git a/src/VCO.cpp b/src/VCO.cpp @@ -87,7 +87,7 @@ int VCO::channels() { return std::max(1, std::max(inputs[PITCH_INPUT].getChannels(), inputs[FM_INPUT].getChannels())); } -void VCO::addEngine(int c) { +void VCO::addChannel(int c) { _engines[c] = new Engine(); _engines[c]->reset(); _engines[c]->sampleRateChange(APP->engine->getSampleRate()); @@ -96,7 +96,7 @@ void VCO::addEngine(int c) { } } -void VCO::removeEngine(int c) { +void VCO::removeChannel(int c) { delete _engines[c]; _engines[c] = NULL; } diff --git a/src/VCO.hpp b/src/VCO.hpp @@ -105,8 +105,8 @@ struct VCO : BGModule { void sampleRateChange() override; bool active() override; int channels() override; - void addEngine(int c) override; - void removeEngine(int c) override; + void addChannel(int c) override; + void removeChannel(int c) override; void modulate() override; void modulateChannel(int c) override; void always(const ProcessArgs& args) override; diff --git a/src/XCO.cpp b/src/XCO.cpp @@ -70,7 +70,7 @@ int XCO::channels() { return std::max(1, std::max(inputs[PITCH_INPUT].getChannels(), inputs[FM_INPUT].getChannels())); } -void XCO::addEngine(int c) { +void XCO::addChannel(int c) { _engines[c] = new Engine(); _engines[c]->reset(); _engines[c]->sampleRateChange(APP->engine->getSampleRate()); @@ -79,7 +79,7 @@ void XCO::addEngine(int c) { } } -void XCO::removeEngine(int c) { +void XCO::removeChannel(int c) { delete _engines[c]; _engines[c] = NULL; } diff --git a/src/XCO.hpp b/src/XCO.hpp @@ -159,8 +159,8 @@ struct XCO : BGModule { void sampleRateChange() override; bool active() override; int channels() override; - void addEngine(int c) override; - void removeEngine(int c) override; + void addChannel(int c) override; + void removeChannel(int c) override; void modulate() override; void modulateChannel(int c) override; void always(const ProcessArgs& args) override; diff --git a/src/module.cpp b/src/module.cpp @@ -28,13 +28,13 @@ void BGModule::process(const ProcessArgs& args) { channelsChanged(channelsBefore, channelsNow); if (channelsBefore < channelsNow) { while (channelsBefore < channelsNow) { - addEngine(channelsBefore); + addChannel(channelsBefore); ++channelsBefore; } } else { while (channelsNow < channelsBefore) { - removeEngine(channelsBefore - 1); + removeChannel(channelsBefore - 1); --channelsBefore; } } diff --git a/src/module.hpp b/src/module.hpp @@ -19,7 +19,7 @@ struct BGModule : Module { } virtual ~BGModule() { while (_channels >= 1) { - removeEngine(_channels - 1); + removeChannel(_channels - 1); --_channels; } } @@ -33,8 +33,8 @@ struct BGModule : Module { virtual bool active() { return true; } virtual int channels() { return 1; } virtual void channelsChanged(int before, int after) {} - virtual void addEngine(int c) {} - virtual void removeEngine(int c) {} + virtual void addChannel(int c) {} + virtual void removeChannel(int c) {} virtual void modulate() {} virtual void modulateChannel(int c) {} virtual void always(const ProcessArgs& args) {}