commit 87b29b4556bc157c84c728d3deccccda21df6ce2
parent 704460b60a62443e9121cd5c4f9284d3c35ce19f
Author: Matt Demanett <matt@demanett.net>
Date: Mon, 3 Jun 2019 23:52:02 -0400
v1: clean up a bunch more .active, .value, .value = on params, inputs, outputs. #60
Diffstat:
15 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/src/Additator.cpp b/src/Additator.cpp
@@ -23,13 +23,13 @@ void Additator::onSampleRateChange() {
}
float Additator::cvValue(Input& cv, bool dc) {
- if (!cv.active) {
+ if (!cv.isConnected()) {
return dc ? 1.0f : 0.0f;
}
if (dc) {
- return clamp(cv.value / 10.0f, 0.0f, 1.0f);
+ return clamp(cv.getVoltage() / 10.0f, 0.0f, 1.0f);
}
- return clamp(cv.value / 5.0f, -1.0f, 1.0f);
+ return clamp(cv.getVoltage() / 5.0f, -1.0f, 1.0f);
}
void Additator::process(const ProcessArgs& args) {
diff --git a/src/EightFO.cpp b/src/EightFO.cpp
@@ -111,17 +111,17 @@ void EightFO::process(const ProcessArgs& args) {
}
Phasor::phase_delta_t EightFO::phaseOffset(Param& p, Input& i, Phasor::phase_delta_t baseOffset) {
- float o = p.value * Phasor::maxPhase / 2.0f;
- if (i.active) {
- o *= clamp(i.value / 5.0f, -1.0f, 1.0f);
+ float o = p.getValue() * Phasor::maxPhase / 2.0f;
+ if (i.isConnected()) {
+ o *= clamp(i.getVoltage() / 5.0f, -1.0f, 1.0f);
}
return baseOffset - o;
}
void EightFO::updateOutput(bool useSample, Output& output, Phasor::phase_delta_t& offset, float& sample, bool& active) {
- if (output.active) {
+ if (output.isConnected()) {
if (useSample && active) {
- output.value = sample;
+ output.setVoltage(sample);
}
else {
float v = 0.0f;
@@ -150,7 +150,7 @@ void EightFO::updateOutput(bool useSample, Output& output, Phasor::phase_delta_t
break;
}
}
- output.value = sample = amplitude * _scale * v + _offset;
+ output.setVoltage(sample = amplitude * _scale * v + _offset);
}
active = true;
}
diff --git a/src/LFO.cpp b/src/LFO.cpp
@@ -82,9 +82,9 @@ void LFO::process(const ProcessArgs& args) {
}
void LFO::updateOutput(Phasor& wave, bool useSample, bool invert, Output& output, float& sample, bool& active) {
- if (output.active) {
+ if (output.isConnected()) {
if (useSample && active) {
- output.value = sample;
+ output.setVoltage(sample);
}
else {
sample = wave.nextFromPhasor(_phasor) * amplitude * _scale;
@@ -92,7 +92,7 @@ void LFO::updateOutput(Phasor& wave, bool useSample, bool invert, Output& output
sample = -sample;
}
sample += _offset;
- output.value = sample;
+ output.setVoltage(sample);
}
active = true;
}
diff --git a/src/Offset.cpp b/src/Offset.cpp
@@ -16,9 +16,9 @@ void Offset::process(const ProcessArgs& args) {
outputs[OUT_OUTPUT].setVoltage(out);
}
-float Offset::knobValue(const Param& knob, const Input& cv) const {
+float Offset::knobValue(const Param& knob, Input& cv) const {
float v = knob.value;
- if (cv.active) {
+ if (cv.isConnected()) {
v *= clamp(cv.value / 10.0f, -1.0f, 1.0f);
}
return v;
diff --git a/src/Offset.hpp b/src/Offset.hpp
@@ -33,7 +33,7 @@ struct Offset : DisableOutputLimitModule {
void process(const ProcessArgs& args) override;
- float knobValue(const Param& knob, const Input& cv) const;
+ float knobValue(const Param& knob, Input& cv) const;
};
} // namespace bogaudio
diff --git a/src/Slew.cpp b/src/Slew.cpp
@@ -42,14 +42,14 @@ void Slew::process(const ProcessArgs& args) {
float Slew::time(Param& param, Input& input) {
float time = param.value;
- if (input.active) {
- time *= clamp(input.value / 10.0f, 0.0f, 1.0f);
+ if (input.isConnected()) {
+ time *= clamp(input.getVoltage() / 10.0f, 0.0f, 1.0f);
}
return time * time * 10000.0f;
}
float Slew::shape(Param& param) {
- float shape = param.value;
+ float shape = param.getValue();
if (shape < 0.0) {
shape = 1.0f + shape;
shape = _rise.minShape + shape * (1.0f - _rise.minShape);
diff --git a/src/VCA.cpp b/src/VCA.cpp
@@ -15,20 +15,20 @@ void VCA::process(const ProcessArgs& args) {
}
void VCA::channelStep(Input& input, Output& output, Param& knob, Input& cv, Amplifier& amplifier, bogaudio::dsp::SlewLimiter& levelSL, bool linear) {
- if (input.active && output.active) {
+ if (input.isConnected() && output.isConnected()) {
float level = knob.value;
- if (cv.active) {
- level *= clamp(cv.value / 10.0f, 0.0f, 1.0f);
+ if (cv.isConnected()) {
+ level *= clamp(cv.getVoltage() / 10.0f, 0.0f, 1.0f);
}
level = levelSL.next(level);
if (linear) {
- output.value = level * input.value;
+ output.setVoltage(level * input.value);
}
else {
level = 1.0f - level;
level *= Amplifier::minDecibels;
amplifier.setLevel(level);
- output.value = amplifier.next(input.value);
+ output.setVoltage(amplifier.next(input.value));
}
}
}
diff --git a/src/VCM.cpp b/src/VCM.cpp
@@ -22,15 +22,15 @@ void VCM::process(const ProcessArgs& args) {
}
float VCM::channelStep(Input& input, Param& knob, Input& cv, Amplifier& amplifier, bool linear) {
- if (!input.active) {
+ if (!input.isConnected()) {
return 0.0f;
}
- float level = knob.value;
- if (cv.active) {
- level *= clamp(cv.value / 10.0f, 0.0f, 1.0f);
+ float level = knob.getValue();
+ if (cv.isConnected()) {
+ level *= clamp(cv.getVoltage() / 10.0f, 0.0f, 1.0f);
}
if (linear) {
- return level * input.value;
+ return level * input.getVoltage();
}
level = 1.0f - level;
level *= Amplifier::minDecibels;
diff --git a/src/XCO.cpp b/src/XCO.cpp
@@ -208,16 +208,16 @@ void XCO::process(const ProcessArgs& args) {
Phasor::phase_delta_t XCO::phaseOffset(Param& param, Input& input) {
float v = param.value;
- if (input.active) {
- v *= clamp(input.value / 5.0f, -1.0f, 1.0f);
+ if (input.isConnected()) {
+ v *= clamp(input.getVoltage() / 5.0f, -1.0f, 1.0f);
}
return -v * Phasor::maxPhase / 2.0f;
}
float XCO::level(Param& param, Input& input) {
float v = param.value;
- if (input.active) {
- v *= clamp(input.value / 10.0f, 0.0f, 1.0f);
+ if (input.isConnected()) {
+ v *= clamp(input.getVoltage() / 10.0f, 0.0f, 1.0f);
}
return v;
}
diff --git a/src/analyzer_base.cpp b/src/analyzer_base.cpp
@@ -184,7 +184,7 @@ void AnalyzerCore::stepChannel(int channelIndex, Input& input) {
assert(channelIndex >= 0);
assert(channelIndex < _nChannels);
- if (input.active) {
+ if (input.isConnected()) {
if (!_channels[channelIndex]) {
std::lock_guard<std::mutex> lock(_channelsMutex);
_channels[channelIndex] = new ChannelAnalyzer(
@@ -196,7 +196,7 @@ void AnalyzerCore::stepChannel(int channelIndex, Input& input) {
_binAverageN
);
}
- _channels[channelIndex]->step(input.value);
+ _channels[channelIndex]->step(input.getVoltage());
}
else if (_channels[channelIndex]) {
std::lock_guard<std::mutex> lock(_channelsMutex);
diff --git a/src/dadsrh_core.cpp b/src/dadsrh_core.cpp
@@ -244,21 +244,21 @@ void DADSRHCore::step() {
_firstStep = false;
}
-float DADSRHCore::stepAmount(const Param& knob, const Input* cv, bool slow, bool allowZero) {
+float DADSRHCore::stepAmount(Param& knob, Input* cv, bool slow, bool allowZero) {
return APP->engine->getSampleTime() / knobTime(knob, cv, slow, allowZero);
}
-float DADSRHCore::knobTime(const Param& knob, const Input* cv, bool slow, bool allowZero) {
+float DADSRHCore::knobTime(Param& knob, Input* cv, bool slow, bool allowZero) {
float t = knobAmount(knob, cv);
t = pow(t, 2.0);
t = fmaxf(t, allowZero ? 0.0 : 0.001);
return t * (slow ? 100.0 : 10.0);
}
-float DADSRHCore::knobAmount(const Param& knob, const Input* cv) const {
- float v = clamp(knob.value, 0.0f, 1.0f);
- if (cv && cv->active) {
- v *= clamp(cv->value / 10.0f, 0.0f, 1.0f);
+float DADSRHCore::knobAmount(Param& knob, Input* cv) const {
+ float v = clamp(knob.getValue(), 0.0f, 1.0f);
+ if (cv && cv->isConnected()) {
+ v *= clamp(cv->getVoltage() / 10.0f, 0.0f, 1.0f);
}
return v;
}
diff --git a/src/dadsrh_core.hpp b/src/dadsrh_core.hpp
@@ -175,9 +175,9 @@ struct DADSRHCore {
void reset();
void step();
- 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);
- float knobAmount(const Param& knob, const Input* cv) const;
+ float stepAmount(Param& knob, Input* cv, bool slow, bool allowZero = false);
+ float knobTime(Param& knob, Input* cv, bool slow, bool allowZero = false);
+ float knobAmount(Param& knob, Input* cv) const;
};
} // namespace bogaudio
diff --git a/src/lfo_base.cpp b/src/lfo_base.cpp
@@ -48,8 +48,8 @@ void LFOBase::setPitchMode(PitchMode mode) {
void LFOBase::setFrequency(bool slow, Param& frequency, Input& pitch, Phasor& phasor) {
float f = frequency.value;
- if (pitch.active) {
- f += pitch.value;
+ if (pitch.isConnected()) {
+ f += pitch.getVoltage();
}
if (slow) {
f -= 8.0f;
diff --git a/src/shaper_core.cpp b/src/shaper_core.cpp
@@ -116,7 +116,7 @@ void ShaperCore::step() {
_firstStep = false;
}
-bool ShaperCore::stepStage(const Param& knob, const Input* cv, bool slow) {
+bool ShaperCore::stepStage(Param& knob, Input* cv, bool slow) {
float t = levelParam(knob, cv);
t = pow(t, 2);
t = fmaxf(t, 0.001);
@@ -125,10 +125,10 @@ bool ShaperCore::stepStage(const Param& knob, const Input* cv, bool slow) {
return _stageProgress > 1.0;
}
-float ShaperCore::levelParam(const Param& knob, const Input* cv) const {
- float v = clamp(knob.value, 0.0f, 1.0f);
- if (cv && cv->active) {
- v *= clamp(cv->value / 10.0f, 0.0f, 1.0f);
+float ShaperCore::levelParam(Param& knob, Input* cv) const {
+ float v = clamp(knob.getValue(), 0.0f, 1.0f);
+ if (cv && cv->isConnected()) {
+ v *= clamp(cv->getVoltage() / 10.0f, 0.0f, 1.0f);
}
return v;
}
diff --git a/src/shaper_core.hpp b/src/shaper_core.hpp
@@ -132,8 +132,8 @@ struct ShaperCore {
void reset();
void step();
- bool stepStage(const Param& knob, const Input* cv, bool slow);
- float levelParam(const Param& knob, const Input* cv) const;
+ bool stepStage(Param& knob, Input* cv, bool slow);
+ float levelParam(Param& knob, Input* cv) const;
};
} // namespace bogaudio
