commit 2a8afe48434d7a51f11e7f358f54c8390da2bdf3
parent bfcd725febd617d0034293f37e0d872f2e16b1bc
Author: Matt Demanett <matt@demanett.net>
Date: Wed, 4 Sep 2019 22:31:28 -0400
Clean up remaining [knob, port].value uses from 1.0 port.
Diffstat:
17 files changed, 59 insertions(+), 56 deletions(-)
diff --git a/src/Cmp.cpp b/src/Cmp.cpp
@@ -132,14 +132,14 @@ void Cmp::stepChannel(
switch (state) {
case LOW:
case LAG_HIGH: {
- highOutput.value = lowValue;
- lowOutput.value = highValue;
+ highOutput.setVoltage(lowValue);
+ lowOutput.setVoltage(highValue);
break;
}
case HIGH:
case LAG_LOW: {
- highOutput.value = highValue;
- lowOutput.value = lowValue;
+ highOutput.setVoltage(highValue);
+ lowOutput.setVoltage(lowValue);
break;
}
}
diff --git a/src/DGate.cpp b/src/DGate.cpp
@@ -62,7 +62,7 @@ void DGate::process(const ProcessArgs& args) {
}
bool DGate::stepStage(Param& knob) {
- float t = knob.value;
+ float t = knob.getValue();
t = pow(t, 2);
t *= 10.0;
_stageProgress += APP->engine->getSampleTime();
diff --git a/src/FlipFlop.cpp b/src/FlipFlop.cpp
@@ -40,8 +40,8 @@ void FlipFlop::channelStep(
Trigger& resetTrigger,
bool& flipped
) {
- bool triggered = trigger.next(triggerInput.value);
- resetTrigger.process(resetInput.value);
+ bool triggered = trigger.next(triggerInput.getVoltage());
+ resetTrigger.process(resetInput.getVoltage());
if (resetTrigger.isHigh()) {
flipped = false;
}
@@ -50,12 +50,12 @@ void FlipFlop::channelStep(
}
if (flipped) {
- aOutput.value = 0.0f;
- bOutput.value = 5.0f;
+ aOutput.setVoltage(0.0f);
+ bOutput.setVoltage(5.0f);
}
else {
- aOutput.value = 5.0f;
- bOutput.value = 0.0f;
+ aOutput.setVoltage(5.0f);
+ bOutput.setVoltage(0.0f);
}
}
diff --git a/src/Mix4.cpp b/src/Mix4.cpp
@@ -63,7 +63,8 @@ void Mix4::process(const ProcessArgs& args) {
outputs[R_OUTPUT].setVoltage(right);
}
else {
- outputs[L_OUTPUT].setVoltage(outputs[R_OUTPUT].value = mono);
+ outputs[L_OUTPUT].setVoltage(mono);
+ outputs[R_OUTPUT].setVoltage(mono);
}
}
diff --git a/src/Mix8.cpp b/src/Mix8.cpp
@@ -87,7 +87,8 @@ void Mix8::process(const ProcessArgs& args) {
outputs[R_OUTPUT].setVoltage(right);
}
else {
- outputs[L_OUTPUT].setVoltage(outputs[R_OUTPUT].value = mono);
+ outputs[L_OUTPUT].setVoltage(mono);
+ outputs[R_OUTPUT].setVoltage(mono);
}
}
diff --git a/src/Offset.cpp b/src/Offset.cpp
@@ -16,10 +16,10 @@ void Offset::process(const ProcessArgs& args) {
outputs[OUT_OUTPUT].setVoltage(out);
}
-float Offset::knobValue(const Param& knob, Input& cv) const {
- float v = knob.value;
+float Offset::knobValue(Param& knob, Input& cv) const {
+ float v = knob.getValue();
if (cv.isConnected()) {
- v *= clamp(cv.value / 10.0f, -1.0f, 1.0f);
+ v *= clamp(cv.getVoltage() / 10.0f, -1.0f, 1.0f);
}
return v;
}
diff --git a/src/Offset.hpp b/src/Offset.hpp
@@ -34,7 +34,7 @@ struct Offset : DisableOutputLimitModule {
void process(const ProcessArgs& args) override;
- float knobValue(const Param& knob, Input& cv) const;
+ float knobValue(Param& knob, Input& cv) const;
};
} // namespace bogaudio
diff --git a/src/Slew.cpp b/src/Slew.cpp
@@ -41,7 +41,7 @@ void Slew::process(const ProcessArgs& args) {
}
float Slew::time(Param& param, Input& input) {
- float time = param.value;
+ float time = param.getValue();
if (input.isConnected()) {
time *= clamp(input.getVoltage() / 10.0f, 0.0f, 1.0f);
}
diff --git a/src/Sums.cpp b/src/Sums.cpp
@@ -5,7 +5,7 @@ void Sums::process(const ProcessArgs& args) {
float a = inputs[A_INPUT].getVoltage();
float b = inputs[B_INPUT].getVoltage();
if (_disableOutputLimit) {
- outputs[SUM_OUTPUT].value = a + b,
+ outputs[SUM_OUTPUT].setVoltage(a + b);
outputs[DIFFERENCE_OUTPUT].setVoltage(a - b);
outputs[MAX_OUTPUT].setVoltage(std::max(a, b));
outputs[MIN_OUTPUT].setVoltage(std::min(a, b));
diff --git a/src/VCA.cpp b/src/VCA.cpp
@@ -20,19 +20,19 @@ 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.isConnected() && output.isConnected()) {
- float level = knob.value;
+ float level = knob.getValue();
if (cv.isConnected()) {
level *= clamp(cv.getVoltage() / 10.0f, 0.0f, 1.0f);
}
level = levelSL.next(level);
if (linear) {
- output.setVoltage(level * input.value);
+ output.setVoltage(level * input.getVoltage());
}
else {
level = 1.0f - level;
level *= Amplifier::minDecibels;
amplifier.setLevel(level);
- output.setVoltage(amplifier.next(input.value));
+ output.setVoltage(amplifier.next(input.getVoltage()));
}
}
}
diff --git a/src/VCAmp.cpp b/src/VCAmp.cpp
@@ -17,8 +17,9 @@ void VCAmp::process(const ProcessArgs& args) {
level *= maxDecibels - minDecibels;
level += minDecibels;
_amplifier.setLevel(_levelSL.next(level));
- outputs[OUT_OUTPUT].setVoltage(_saturator.next(_amplifier.next(inputs[IN_INPUT].getVoltage())));
- _rmsLevel = _rms.next(outputs[OUT_OUTPUT].value / 5.0f);
+ float out = _saturator.next(_amplifier.next(inputs[IN_INPUT].getVoltage()));
+ outputs[OUT_OUTPUT].setVoltage(out);
+ _rmsLevel = _rms.next(out / 5.0f);
}
else {
_rmsLevel = _rms.next(0.0f);
diff --git a/src/VCM.cpp b/src/VCM.cpp
@@ -39,7 +39,7 @@ float VCM::channelStep(Input& input, Param& knob, Input& cv, Amplifier& amplifie
level = 1.0f - level;
level *= Amplifier::minDecibels;
amplifier.setLevel(level);
- return amplifier.next(input.value);
+ return amplifier.next(input.getVoltage());
}
struct VCMWidget : DisableOutputLimitModuleWidget {
diff --git a/src/XCO.cpp b/src/XCO.cpp
@@ -212,7 +212,7 @@ void XCO::process(const ProcessArgs& args) {
}
Phasor::phase_delta_t XCO::phaseOffset(Param& param, Input& input) {
- float v = param.value;
+ float v = param.getValue();
if (input.isConnected()) {
v *= clamp(input.getVoltage() / 5.0f, -1.0f, 1.0f);
}
@@ -220,7 +220,7 @@ Phasor::phase_delta_t XCO::phaseOffset(Param& param, Input& input) {
}
float XCO::level(Param& param, Input& input) {
- float v = param.value;
+ float v = param.getValue();
if (input.isConnected()) {
v *= clamp(input.getVoltage() / 10.0f, 0.0f, 1.0f);
}
diff --git a/src/dadsrh_core.cpp b/src/dadsrh_core.cpp
@@ -15,12 +15,12 @@ void DADSRHCore::step() {
const float shapeExponent = 2.0;
const float shapeInverseExponent = 0.5;
- bool slow = _speedParam.value <= 0.5;
+ bool slow = _speedParam.getValue() <= 0.5;
if (
- _trigger.process(_triggerParam.value + _triggerInput.value) ||
- (_firstStep && _triggerOnLoad && _shouldTriggerOnLoad && _loopParam.value < 0.5 && _modeParam.value < 0.5)
+ _trigger.process(_triggerParam.getValue() + _triggerInput.getVoltage()) ||
+ (_firstStep && _triggerOnLoad && _shouldTriggerOnLoad && _loopParam.getValue() < 0.5 && _modeParam.getValue() < 0.5)
) {
- if (_stage == STOPPED_STAGE || _retriggerParam.value <= 0.5) {
+ if (_stage == STOPPED_STAGE || _retriggerParam.getValue() <= 0.5) {
_stage = DELAY_STAGE;
_holdProgress = _stageProgress = _envelope = 0.0;
}
@@ -46,7 +46,7 @@ void DADSRHCore::step() {
case SUSTAIN_STAGE:
case RELEASE_STAGE: {
_stage = ATTACK_STAGE;
- switch ((int)_attackShapeParam.value) {
+ switch ((int)_attackShapeParam.getValue()) {
case SHAPE2: {
_stageProgress = _envelope;
break;
@@ -82,7 +82,7 @@ void DADSRHCore::step() {
case ATTACK_STAGE:
case DECAY_STAGE:
case SUSTAIN_STAGE: {
- bool gateMode = _modeParam.value > 0.5;
+ bool gateMode = _modeParam.getValue() > 0.5;
bool holdComplete = _holdProgress >= 1.0;
if (!holdComplete) {
// run the hold accumulation even if we're not in hold mode, in case we switch mid-cycle.
@@ -117,7 +117,7 @@ void DADSRHCore::step() {
case ATTACK_STAGE: {
_stageProgress += stepAmount(_attackParam, _attackInput, slow);
- switch ((int)_attackShapeParam.value) {
+ switch ((int)_attackShapeParam.getValue()) {
case SHAPE2: {
_envelope = _stageProgress;
break;
@@ -141,7 +141,7 @@ void DADSRHCore::step() {
case DECAY_STAGE: {
float sustainLevel = knobAmount(_sustainParam, _sustainInput);
_stageProgress += stepAmount(_decayParam, _decayInput, slow);
- switch ((int)_decayShapeParam.value) {
+ switch ((int)_decayShapeParam.getValue()) {
case SHAPE2: {
_envelope = 1.0 - _stageProgress;
break;
@@ -170,7 +170,7 @@ void DADSRHCore::step() {
case RELEASE_STAGE: {
_stageProgress += stepAmount(_releaseParam, _releaseInput, slow);
- switch ((int)_releaseShapeParam.value) {
+ switch ((int)_releaseShapeParam.getValue()) {
case SHAPE2: {
_envelope = 1.0 - _stageProgress;
break;
@@ -188,7 +188,7 @@ void DADSRHCore::step() {
if (_envelope <= 0.001) {
complete = true;
_envelope = 0.0;
- if (_modeParam.value < 0.5 && (_loopParam.value <= 0.5 || _trigger.isHigh())) {
+ if (_modeParam.getValue() < 0.5 && (_loopParam.getValue() <= 0.5 || _trigger.isHigh())) {
_stage = DELAY_STAGE;
_holdProgress = _stageProgress = 0.0;
}
@@ -201,13 +201,13 @@ void DADSRHCore::step() {
}
float env = _envelope * 10.0;
- _envOutput.value = env;
- _invOutput.value = 10.0 - env;
+ _envOutput.setVoltage(env);
+ _invOutput.setVoltage(10.0 - env);
if (complete) {
_triggerOuptutPulseGen.trigger(0.001);
}
- _triggerOutput.value = _triggerOuptutPulseGen.process(APP->engine->getSampleTime()) ? 5.0 : 0.0;
+ _triggerOutput.setVoltage(_triggerOuptutPulseGen.process(APP->engine->getSampleTime()) ? 5.0 : 0.0);
if (_delayOutput) {
_delayOutput->value = _stage == DELAY_STAGE ? 5.0 : 0.0;
diff --git a/src/lfo_base.cpp b/src/lfo_base.cpp
@@ -19,7 +19,7 @@ float LFOBase::getPitchOffset() {
}
void LFOBase::setFrequency(Param& frequency, Input& pitch, Phasor& phasor) {
- float f = frequency.value;
+ float f = frequency.getValue();
if (pitch.isConnected()) {
f += pitch.getVoltage();
}
diff --git a/src/mixer.cpp b/src/mixer.cpp
@@ -18,30 +18,30 @@ void MixerChannel::next(bool stereo, bool solo) {
return;
}
- float mute = _muteParam.value;
+ float mute = _muteParam.getValue();
if (_muteInput) {
- mute += clamp(_muteInput->value, 0.0f, 10.0f);
+ mute += clamp(_muteInput->getVoltage(), 0.0f, 10.0f);
}
bool muted = solo ? mute < 2.0f : mute > 0.5f;
if (muted) {
_amplifier.setLevel(_levelSL.next(minDecibels));
}
else {
- float level = clamp(_levelParam.value, 0.0f, 1.0f);
+ float level = clamp(_levelParam.getValue(), 0.0f, 1.0f);
if (_levelInput.isConnected()) {
- level *= clamp(_levelInput.value / 10.0f, 0.0f, 1.0f);
+ level *= clamp(_levelInput.getVoltage() / 10.0f, 0.0f, 1.0f);
}
level *= maxDecibels - minDecibels;
level += minDecibels;
_amplifier.setLevel(_levelSL.next(level));
}
- out = _amplifier.next(_inInput.value);
+ out = _amplifier.next(_inInput.getVoltage());
rms = _rms.next(out / 5.0f);
if (stereo) {
- float pan = clamp(_panParam.value, -1.0f, 1.0f);
+ float pan = clamp(_panParam.getValue(), -1.0f, 1.0f);
if (_panInput.isConnected()) {
- pan *= clamp(_panInput.value / 5.0f, -1.0f, 1.0f);
+ pan *= clamp(_panInput.getVoltage() / 5.0f, -1.0f, 1.0f);
}
_panner.setPan(_panSL.next(pan));
_panner.next(out, left, right);
diff --git a/src/shaper_core.cpp b/src/shaper_core.cpp
@@ -10,10 +10,10 @@ void ShaperCore::reset() {
void ShaperCore::step() {
bool complete = false;
- bool slow = _speedParam.value <= 0.0;
+ bool slow = _speedParam.getValue() <= 0.0;
if (
- _trigger.process(_triggerParam.value + _triggerInput.value) ||
- (_firstStep && _triggerOnLoad && _shouldTriggerOnLoad && _loopParam.value <= 0.0)
+ _trigger.process(_triggerParam.getValue() + _triggerInput.getVoltage()) ||
+ (_firstStep && _triggerOnLoad && _shouldTriggerOnLoad && _loopParam.getValue() <= 0.0)
) {
_stage = ATTACK_STAGE;
_stageProgress = 0.0;
@@ -47,7 +47,7 @@ void ShaperCore::step() {
case OFF_STAGE: {
if (stepStage(_offParam, _offInput, slow)) {
complete = true;
- if (_loopParam.value <= 0.0 || _trigger.isHigh()) {
+ if (_loopParam.getValue() <= 0.0 || _trigger.isHigh()) {
_stage = ATTACK_STAGE;
_stageProgress = 0.0;
}
@@ -83,17 +83,17 @@ void ShaperCore::step() {
}
float signalLevel = levelParam(_signalParam, _signalCVInput);
- _signalOutput.value = signalLevel * envelope * _signalInput.getNormalVoltage(0.0);
+ _signalOutput.setVoltage(signalLevel * envelope * _signalInput.getNormalVoltage(0.0));
float envLevel = levelParam(_envParam, _envInput);
float envOutput = clamp(envLevel * envelope, 0.0f, 10.0f);
- _envOutput.value = envOutput;
- _invOutput.value = 10.0 - envOutput;
+ _envOutput.setVoltage(envOutput);
+ _invOutput.setVoltage(10.0 - envOutput);
if (complete) {
_triggerOuptutPulseGen.trigger(0.001);
}
- _triggerOutput.value = _triggerOuptutPulseGen.process(APP->engine->getSampleTime()) ? 5.0 : 0.0;
+ _triggerOutput.setVoltage(_triggerOuptutPulseGen.process(APP->engine->getSampleTime()) ? 5.0 : 0.0);
if (_attackOutput) {
_attackOutput->value = _stage == ATTACK_STAGE ? 5.0 : 0.0;
