BogaudioModules

BogaudioModules for VCV Rack
Log | Files | Refs | README | LICENSE

commit 29afc01e386f3c97a56b4fe37cd05519dfe91fa9
parent c9b4b39514938f9ac50bc8ae4706f31eca3cef45
Author: Matt Demanett <matt@demanett.net>
Date:   Sun,  3 Dec 2017 11:36:19 -0500

Namespace.

Diffstat:
Msrc/Analyzer.cpp | 21++++++++++++---------
Msrc/Noise.cpp | 10++++++----
2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/Analyzer.cpp b/src/Analyzer.cpp @@ -4,7 +4,9 @@ #include "dsp/dsp.hpp" #include "BogaudioModules.hpp" -struct ChannelAnalyzer : bogaudio::dsp::SpectrumAnalyzer { +using namespace bogaudio::dsp; + +struct ChannelAnalyzer : SpectrumAnalyzer { const int _averageN; const int _binsN; float* _bins; @@ -12,13 +14,13 @@ struct ChannelAnalyzer : bogaudio::dsp::SpectrumAnalyzer { int _currentFrame; ChannelAnalyzer( - bogaudio::dsp::SpectrumAnalyzer::Size size, - bogaudio::dsp::SpectrumAnalyzer::Overlap overlap, - bogaudio::dsp::SpectrumAnalyzer::WindowType windowType, + SpectrumAnalyzer::Size size, + SpectrumAnalyzer::Overlap overlap, + SpectrumAnalyzer::WindowType windowType, float sampleRate, int averageN ) - : bogaudio::dsp::SpectrumAnalyzer(size, overlap, windowType, sampleRate) + : SpectrumAnalyzer(size, overlap, windowType, sampleRate) , _averageN(averageN) , _binsN(size / 2) , _bins(new float[size] {}) @@ -28,6 +30,7 @@ struct ChannelAnalyzer : bogaudio::dsp::SpectrumAnalyzer { } virtual ~ChannelAnalyzer() { delete[] _bins; + delete[] _frames; } @@ -35,7 +38,7 @@ struct ChannelAnalyzer : bogaudio::dsp::SpectrumAnalyzer { }; bool ChannelAnalyzer::step(float sample) { - if (bogaudio::dsp::SpectrumAnalyzer::step(sample)) { + if (SpectrumAnalyzer::step(sample)) { float* frame = _frames + _currentFrame*_binsN; getMagnitudes(frame, _binsN); @@ -78,7 +81,7 @@ struct Analyzer : Module { NUM_LIGHTS }; - const bogaudio::dsp::SpectrumAnalyzer::Size _size = bogaudio::dsp::SpectrumAnalyzer::SIZE_1024; + const SpectrumAnalyzer::Size _size = SpectrumAnalyzer::SIZE_1024; int _averageN; ChannelAnalyzer* _channelA = NULL; ChannelAnalyzer* _channelB = NULL; @@ -132,8 +135,8 @@ void Analyzer::stepChannel(ChannelAnalyzer*& channelPointer, bool running, Input if (!channelPointer) { channelPointer = new ChannelAnalyzer( _size, - bogaudio::dsp::SpectrumAnalyzer::OVERLAP_2, - bogaudio::dsp::SpectrumAnalyzer::WINDOW_HAMMING, + SpectrumAnalyzer::OVERLAP_2, + SpectrumAnalyzer::WINDOW_HAMMING, engineGetSampleRate(), _averageN ); diff --git a/src/Noise.cpp b/src/Noise.cpp @@ -2,6 +2,8 @@ #include "BogaudioModules.hpp" #include "dsp/dsp.hpp" +using namespace bogaudio::dsp; + struct Noise : Module { enum ParamsIds { NUM_PARAMS @@ -25,10 +27,10 @@ struct Noise : Module { NUM_LIGHTS }; - bogaudio::dsp::WhiteNoiseGenerator _white; - bogaudio::dsp::PinkNoiseGenerator _pink; - bogaudio::dsp::RedNoiseGenerator _red; - bogaudio::dsp::GaussianNoiseGenerator _gauss; + WhiteNoiseGenerator _white; + PinkNoiseGenerator _pink; + RedNoiseGenerator _red; + GaussianNoiseGenerator _gauss; Noise() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) {}