commit 62ff449599c2fdaf6b059247e7fc5aae8d8a84d6
parent 70c52be7b9476e47f410d6235f3a0239224bcb37
Author: Matt Demanett <matt@demanett.net>
Date: Sat, 18 May 2019 18:55:15 -0400
v1: rack namespace on SchmittTrigger and PulseGenerator.
Diffstat:
6 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/AD.hpp b/src/AD.hpp
@@ -45,7 +45,7 @@ struct AD : Module {
bool _loopMode = false;
bool _linearMode = false;
Trigger _trigger;
- PulseGenerator _eocPulseGen;
+ rack::dsp::PulseGenerator _eocPulseGen;
bool _on = false;
ADSR _envelope;
bogaudio::dsp::SlewLimiter _attackSL;
diff --git a/src/DGate.hpp b/src/DGate.hpp
@@ -40,7 +40,7 @@ struct DGate : TriggerOnLoadModule {
bool _firstStep = true;
Trigger _trigger;
- PulseGenerator _triggerOuptutPulseGen;
+ rack::dsp::PulseGenerator _triggerOuptutPulseGen;
Stage _stage;
float _stageProgress;
diff --git a/src/Manual.hpp b/src/Manual.hpp
@@ -34,7 +34,7 @@ struct Manual : TriggerOnLoadModule {
bool _firstStep = true;
Trigger _trigger;
- PulseGenerator _pulse;
+ rack::dsp::PulseGenerator _pulse;
Manual() : TriggerOnLoadModule(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) {
_triggerOnLoad = false;
diff --git a/src/dadsrh_core.hpp b/src/dadsrh_core.hpp
@@ -65,7 +65,7 @@ struct DADSRHCore {
bool& _triggerOnLoad;
bool& _shouldTriggerOnLoad;
Trigger _trigger;
- PulseGenerator _triggerOuptutPulseGen;
+ rack::dsp::PulseGenerator _triggerOuptutPulseGen;
Stage _stage;
float _envelope, _stageProgress, _holdProgress, _releaseLevel;
diff --git a/src/rack_overrides.hpp b/src/rack_overrides.hpp
@@ -2,11 +2,9 @@
#include "rack.hpp"
-using namespace rack;
-
namespace bogaudio {
-struct Trigger : SchmittTrigger {
+struct Trigger : rack::dsp::SchmittTrigger {
float _highThreshold;
float _lowThreshold;
diff --git a/src/shaper_core.hpp b/src/shaper_core.hpp
@@ -50,7 +50,7 @@ struct ShaperCore {
bool& _triggerOnLoad;
bool& _shouldTriggerOnLoad;
Trigger _trigger;
- PulseGenerator _triggerOuptutPulseGen;
+ rack::dsp::PulseGenerator _triggerOuptutPulseGen;
Stage _stage;
float _stageProgress;