commit c5ba1c6b7cc7d386cbe6d820496528513a7848c9 parent 4adba336dd323b4f88f67b0c89b730164cae07bd Author: Matt Demanett <matt@demanett.net> Date: Sun, 3 Jun 2018 22:29:55 -0400 Drop redundant virtual on methods declared override. Diffstat:
60 files changed, 132 insertions(+), 132 deletions(-)
diff --git a/benchmarks/buffer_benchmark.cpp b/benchmarks/buffer_benchmark.cpp @@ -7,7 +7,7 @@ using namespace bogaudio::dsp; struct BMOverlappingBuffer : OverlappingBuffer<float> { BMOverlappingBuffer(int size, int o) : OverlappingBuffer(size, o) {} - virtual void process(float* samples) override {} + void process(float* samples) override {} }; static void BM_OverlappingBuffer(benchmark::State& state) { diff --git a/scripts/svg_widgets.rb b/scripts/svg_widgets.rb @@ -24,8 +24,8 @@ struct %MODULE% : Module { onReset(); } - virtual void onReset() override; - virtual void step() override; + void onReset() override; + void step() override; }; } // namespace %HEADER% diff --git a/src/ADSR.hpp b/src/ADSR.hpp @@ -47,9 +47,9 @@ struct ADSR : Module { onSampleRateChange(); } - virtual void onReset() override; - virtual void onSampleRateChange() override; - virtual void step() override; + void onReset() override; + void onSampleRateChange() override; + void step() override; }; } // namespace bogaudio diff --git a/src/Additator.hpp b/src/Additator.hpp @@ -100,10 +100,10 @@ struct Additator : Module { onSampleRateChange(); } - virtual void onReset() override; - virtual void onSampleRateChange() override; + void onReset() override; + void onSampleRateChange() override; float cvValue(Input& cv, bool dc = false); - virtual void step() override; + void step() override; }; } // namespace bogaudio diff --git a/src/Analyzer.cpp b/src/Analyzer.cpp @@ -39,7 +39,7 @@ struct bogaudio::ChannelAnalyzer : SpectrumAnalyzer { return _averagedBins->getAverages(); } - virtual bool step(float sample) override; + bool step(float sample) override; float getPeak(); }; diff --git a/src/Analyzer.hpp b/src/Analyzer.hpp @@ -67,11 +67,11 @@ struct Analyzer : Module { onReset(); } - virtual void onReset() override; - virtual void onSampleRateChange() override; + void onReset() override; + void onSampleRateChange() override; void resetChannels(); SpectrumAnalyzer::Size size(); - virtual void step() override; + void step() override; void stepChannel(ChannelAnalyzer*& channelPointer, bool running, Input& input, Output& output); }; diff --git a/src/Bool.hpp b/src/Bool.hpp @@ -33,7 +33,7 @@ struct Bool : Module { Bool() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) { } - virtual void step() override; + void step() override; }; } // namespace bogaudio diff --git a/src/CVD.hpp b/src/CVD.hpp @@ -43,8 +43,8 @@ struct CVD : Module { onSampleRateChange(); } - virtual void onSampleRateChange() override; - virtual void step() override; + void onSampleRateChange() override; + void step() override; }; } // namespace bogaudio diff --git a/src/DADSRH.cpp b/src/DADSRH.cpp @@ -92,7 +92,7 @@ struct DADSRHWidget : ModuleWidget { addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(releaseShape3LightPosition, module, DADSRH::RELEASE_SHAPE3_LIGHT)); } - virtual void appendContextMenu(Menu* menu) override { + void appendContextMenu(Menu* menu) override { DADSRH* dadsrh = dynamic_cast<DADSRH*>(module); assert(dadsrh); menu->addChild(new MenuLabel()); diff --git a/src/DADSRH.hpp b/src/DADSRH.hpp @@ -118,15 +118,15 @@ struct DADSRH : TriggerOnLoadModule { onReset(); } - virtual void onReset() override { + void onReset() override { _core.reset(); } - virtual void step() override { + void step() override { _core.step(); } - virtual bool shouldTriggerOnNextLoad() override { + bool shouldTriggerOnNextLoad() override { return _core._stage != _core.STOPPED_STAGE; } }; diff --git a/src/DADSRHPlus.cpp b/src/DADSRHPlus.cpp @@ -114,7 +114,7 @@ struct DADSRHPlusWidget : ModuleWidget { addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(releaseShape3LightPosition, module, DADSRHPlus::RELEASE_SHAPE3_LIGHT)); } - virtual void appendContextMenu(Menu* menu) override { + void appendContextMenu(Menu* menu) override { DADSRHPlus* dadsrhPlus = dynamic_cast<DADSRHPlus*>(module); assert(dadsrhPlus); menu->addChild(new MenuLabel()); diff --git a/src/DADSRHPlus.hpp b/src/DADSRHPlus.hpp @@ -129,15 +129,15 @@ struct DADSRHPlus : TriggerOnLoadModule { onReset(); } - virtual void onReset() override { + void onReset() override { _core.reset(); } - virtual void step() override { + void step() override { _core.step(); } - virtual bool shouldTriggerOnNextLoad() override { + bool shouldTriggerOnNextLoad() override { return _core._stage != _core.STOPPED_STAGE; } }; diff --git a/src/DGate.cpp b/src/DGate.cpp @@ -113,7 +113,7 @@ struct DGateWidget : ModuleWidget { addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(gateLightPosition, module, DGate::GATE_LIGHT)); } - virtual void appendContextMenu(Menu* menu) override { + void appendContextMenu(Menu* menu) override { DGate* dgate = dynamic_cast<DGate*>(module); assert(dgate); menu->addChild(new MenuLabel()); diff --git a/src/DGate.hpp b/src/DGate.hpp @@ -48,10 +48,10 @@ struct DGate : TriggerOnLoadModule { onReset(); } - virtual void onReset() override; - virtual void step() override; + void onReset() override; + void step() override; bool stepStage(Param& knob); - virtual bool shouldTriggerOnNextLoad() override { + bool shouldTriggerOnNextLoad() override { return _stage != STOPPED_STAGE; }; }; diff --git a/src/Detune.hpp b/src/Detune.hpp @@ -35,7 +35,7 @@ struct Detune : Module { Detune() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) { } - virtual void step() override; + void step() override; }; } // namespace bogaudio diff --git a/src/EightFO.hpp b/src/EightFO.hpp @@ -130,9 +130,9 @@ struct EightFO : Module { onSampleRateChange(); } - virtual void onReset() override; - virtual void onSampleRateChange() override; - virtual void step() override; + void onReset() override; + void onSampleRateChange() override; + void step() override; Phasor::phase_delta_t phaseOffset(Param& p, Input& i, Phasor::phase_delta_t baseOffset); void updateOutput(bool useSample, Output& output, Phasor::phase_delta_t& offset, float& sample, bool& active); }; diff --git a/src/FMOp.cpp b/src/FMOp.cpp @@ -249,7 +249,7 @@ struct FMOpWidget : ModuleWidget { addChild(ModuleLightWidget::create<SmallLight<GreenLight>>(envToDepthLightPosition, module, FMOp::ENV_TO_DEPTH_LIGHT)); } - virtual void appendContextMenu(Menu* menu) override { + void appendContextMenu(Menu* menu) override { FMOp* fmop = dynamic_cast<FMOp*>(module); assert(fmop); menu->addChild(new MenuLabel()); diff --git a/src/FMOp.hpp b/src/FMOp.hpp @@ -87,11 +87,11 @@ struct FMOp : Module { onSampleRateChange(); } - virtual void onReset() override; - virtual void onSampleRateChange() override; - virtual json_t* toJson() override; - virtual void fromJson(json_t* root) override; - virtual void step() override; + void onReset() override; + void onSampleRateChange() override; + json_t* toJson() override; + void fromJson(json_t* root) override; + void step() override; }; } // namespace bogaudio diff --git a/src/FlipFlop.hpp b/src/FlipFlop.hpp @@ -45,8 +45,8 @@ struct FlipFlop : Module { onReset(); } - virtual void onReset() override; - virtual void step() override; + void onReset() override; + void step() override; void channelStep( Input& triggerInput, Input& resetInput, diff --git a/src/Follow.hpp b/src/Follow.hpp @@ -41,8 +41,8 @@ struct Follow : Module { onSampleRateChange(); } - virtual void onSampleRateChange() override; - virtual void step() override; + void onSampleRateChange() override; + void step() override; }; } // namespace bogaudio diff --git a/src/LFO.hpp b/src/LFO.hpp @@ -79,9 +79,9 @@ struct LFO : Module { onSampleRateChange(); } - virtual void onReset() override; - virtual void onSampleRateChange() override; - virtual void step() override; + void onReset() override; + void onSampleRateChange() override; + void step() override; void updateOutput(Phasor& wave, bool useSample, bool invert, Output& output, float& sample, bool& active); }; diff --git a/src/Lag.hpp b/src/Lag.hpp @@ -41,8 +41,8 @@ struct Lag : Module { onReset(); } - virtual void onReset() override; - virtual void step() override; + void onReset() override; + void step() override; }; } // namespace bogaudio diff --git a/src/Manual.cpp b/src/Manual.cpp @@ -68,7 +68,7 @@ struct ManualWidget : ModuleWidget { addOutput(Port::create<Port24>(out8OutputPosition, Port::OUTPUT, module, Manual::OUT8_OUTPUT)); } - virtual void appendContextMenu(Menu* menu) override { + void appendContextMenu(Menu* menu) override { Manual* manual = dynamic_cast<Manual*>(module); assert(manual); menu->addChild(new MenuLabel()); diff --git a/src/Manual.hpp b/src/Manual.hpp @@ -41,9 +41,9 @@ struct Manual : TriggerOnLoadModule { onReset(); } - virtual void onReset() override; - virtual void step() override; - virtual bool shouldTriggerOnNextLoad() override { + void onReset() override; + void step() override; + bool shouldTriggerOnNextLoad() override { return true; } }; diff --git a/src/Mix4.hpp b/src/Mix4.hpp @@ -75,8 +75,8 @@ struct Mix4 : Module { _rms.setSensitivity(0.05f); } - virtual void onSampleRateChange() override; - virtual void step() override; + void onSampleRateChange() override; + void step() override; }; } // namespace bogaudio diff --git a/src/Mix8.hpp b/src/Mix8.hpp @@ -107,8 +107,8 @@ struct Mix8 : Module { _rms.setSensitivity(0.05f); } - virtual void onSampleRateChange() override; - virtual void step() override; + void onSampleRateChange() override; + void step() override; }; } // namespace bogaudio diff --git a/src/Mult.hpp b/src/Mult.hpp @@ -34,7 +34,7 @@ struct Mult : Module { Mult() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) { } - virtual void step() override; + void step() override; }; } // namespace bogaudio diff --git a/src/Noise.hpp b/src/Noise.hpp @@ -41,7 +41,7 @@ struct Noise : Module { Noise() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) {} - virtual void step() override; + void step() override; }; } // namespace bogaudio diff --git a/src/Offset.hpp b/src/Offset.hpp @@ -27,7 +27,7 @@ struct Offset : Module { Offset() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS) {} - virtual void step() override; + void step() override; float knobValue(const Param& knob, const Input& cv) const; }; diff --git a/src/Pan.hpp b/src/Pan.hpp @@ -43,8 +43,8 @@ struct Pan : Module { onSampleRateChange(); } - virtual void onSampleRateChange() override; - virtual void step() override; + void onSampleRateChange() override; + void step() override; }; } // namespace bogaudio diff --git a/src/RM.hpp b/src/RM.hpp @@ -38,7 +38,7 @@ struct RM : Module { RM() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) { } - virtual void step() override; + void step() override; }; } // namespace bogaudio diff --git a/src/Reftone.hpp b/src/Reftone.hpp @@ -42,11 +42,11 @@ struct Reftone : Module { onSampleRateChange(); } - virtual void onSampleRateChange() override { + void onSampleRateChange() override { _sine.setSampleRate(engineGetSampleRate()); } - virtual void step() override; + void step() override; }; } // namespace bogaudio diff --git a/src/SampleHold.hpp b/src/SampleHold.hpp @@ -38,8 +38,8 @@ struct SampleHold : Module { onReset(); } - virtual void onReset() override; - virtual void step() override; + void onReset() override; + void step() override; void step( Param& triggerParam, Input& triggerInput, diff --git a/src/Shaper.cpp b/src/Shaper.cpp @@ -68,7 +68,7 @@ struct ShaperWidget : ModuleWidget { addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(offLightPosition, module, Shaper::OFF_LIGHT)); } - virtual void appendContextMenu(Menu* menu) override { + void appendContextMenu(Menu* menu) override { Shaper* shaper = dynamic_cast<Shaper*>(module); assert(shaper); menu->addChild(new MenuLabel()); diff --git a/src/Shaper.hpp b/src/Shaper.hpp @@ -92,15 +92,15 @@ struct Shaper : TriggerOnLoadModule { onReset(); } - virtual void onReset() override { + void onReset() override { _core.reset(); } - virtual void step() override { + void step() override { _core.step(); } - virtual bool shouldTriggerOnNextLoad() override { + bool shouldTriggerOnNextLoad() override { return _core._stage != _core.STOPPED_STAGE; } }; diff --git a/src/ShaperPlus.cpp b/src/ShaperPlus.cpp @@ -90,7 +90,7 @@ struct ShaperPlusWidget : ModuleWidget { addChild(ModuleLightWidget::create<TinyLight<GreenLight>>(offLightPosition, module, ShaperPlus::OFF_LIGHT)); } - virtual void appendContextMenu(Menu* menu) override { + void appendContextMenu(Menu* menu) override { ShaperPlus* shaperPlus = dynamic_cast<ShaperPlus*>(module); assert(shaperPlus); menu->addChild(new MenuLabel()); diff --git a/src/ShaperPlus.hpp b/src/ShaperPlus.hpp @@ -99,15 +99,15 @@ struct ShaperPlus : TriggerOnLoadModule { onReset(); } - virtual void onReset() override { + void onReset() override { _core.reset(); } - virtual void step() override { + void step() override { _core.step(); } - virtual bool shouldTriggerOnNextLoad() override { + bool shouldTriggerOnNextLoad() override { return _core._stage != _core.STOPPED_STAGE; } }; diff --git a/src/Stack.hpp b/src/Stack.hpp @@ -41,7 +41,7 @@ struct Stack : Module { Stack() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) { } - virtual void step() override; + void step() override; }; } // namespace bogaudio diff --git a/src/Sums.hpp b/src/Sums.hpp @@ -34,7 +34,7 @@ struct Sums : Module { Sums() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) { } - virtual void step() override; + void step() override; }; } // namespace bogaudio diff --git a/src/Switch.hpp b/src/Switch.hpp @@ -37,8 +37,8 @@ struct Switch : Module { onReset(); } - virtual void onReset() override; - virtual void step() override; + void onReset() override; + void step() override; }; } // namespace bogaudio diff --git a/src/Test.hpp b/src/Test.hpp @@ -290,8 +290,8 @@ struct Test : Module { #endif } - virtual void onReset() override; - virtual void step() override; + void onReset() override; + void step() override; float oscillatorPitch(float max = 10000.0); float oscillatorPitch2(float max = 10000.0); float ratio2(); diff --git a/src/Test2.hpp b/src/Test2.hpp @@ -68,8 +68,8 @@ struct Test2 : Module { onReset(); } - virtual void onReset() override; - virtual void step() override; + void onReset() override; + void step() override; // float oscillatorPitch1A(); }; diff --git a/src/VCA.hpp b/src/VCA.hpp @@ -41,7 +41,7 @@ struct VCA : Module { VCA() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) {} - virtual void step() override; + void step() override; void channelStep(Input& input, Output& output, Param& knob, Input& cv, Amplifier& amplifier, bool linear); }; diff --git a/src/VCAL.hpp b/src/VCAL.hpp @@ -33,7 +33,7 @@ struct VCAL : Module { VCAL() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) {} - virtual void step() override; + void step() override; void channelStep(Input& input, Output& output, Param& knob, Input& cv); }; diff --git a/src/VCAmp.hpp b/src/VCAmp.hpp @@ -41,8 +41,8 @@ struct VCAmp : Module { _rms.setSensitivity(0.05f); } - virtual void onSampleRateChange() override; - virtual void step() override; + void onSampleRateChange() override; + void step() override; }; } // namespace bogaudio diff --git a/src/VCM.hpp b/src/VCM.hpp @@ -52,7 +52,7 @@ struct VCM : Module { onReset(); } - virtual void step() override; + void step() override; float channelStep(Input& input, Param& knob, Input& cv, Amplifier& amplifier, bool linear); }; diff --git a/src/VCO.hpp b/src/VCO.hpp @@ -77,9 +77,9 @@ struct VCO : Module { _square.setQuality(12); } - virtual void onReset() override; - virtual void onSampleRateChange() override; - virtual void step() override; + void onReset() override; + void onSampleRateChange() override; + void step() override; void setSampleRate(float sampleRate); void setFrequency(float frequency); }; diff --git a/src/VU.cpp b/src/VU.cpp @@ -42,7 +42,7 @@ struct VUDisplay : OpaqueWidget { } } - virtual void draw(NVGcontext* vg) override { + void draw(NVGcontext* vg) override { float lDb = _module->_lLevel; if (lDb > 0.0f) { lDb = amplitudeToDecibels(lDb); diff --git a/src/VU.hpp b/src/VU.hpp @@ -41,8 +41,8 @@ struct VU : Module { _rRms.setSensitivity(0.05f); } - virtual void onSampleRateChange() override; - virtual void step() override; + void onSampleRateChange() override; + void step() override; }; } // namespace bogaudio diff --git a/src/XCO.hpp b/src/XCO.hpp @@ -127,9 +127,9 @@ struct XCO : Module { _square.setQuality(12); } - virtual void onReset() override; - virtual void onSampleRateChange() override; - virtual void step() override; + void onReset() override; + void onSampleRateChange() override; + void step() override; Phasor::phase_delta_t phaseOffset(Param& param, Input& input); float level(Param& param, Input& input); void setSampleRate(float sampleRate); diff --git a/src/XFade.hpp b/src/XFade.hpp @@ -39,7 +39,7 @@ struct XFade : Module { XFade() : Module(NUM_PARAMS, NUM_INPUTS, NUM_OUTPUTS, NUM_LIGHTS) { } - virtual void step() override; + void step() override; }; } // namespace bogaudio diff --git a/src/dsp/analyzer.hpp b/src/dsp/analyzer.hpp @@ -166,7 +166,7 @@ struct SpectrumAnalyzer : OverlappingBuffer<float> { delete[] _fftOut; } - virtual void process(float* samples) override { + void process(float* samples) override { float* input = samples; if (_window) { _window->apply(samples, _windowOut); diff --git a/src/dsp/envelope.hpp b/src/dsp/envelope.hpp @@ -57,7 +57,7 @@ struct ADSR : EnvelopeGenerator { void setShapes(float attackShape, float decayShape, float releaseShape); bool isStage(Stage stage) { return _stage == stage; } - virtual float _next() override; + float _next() override; }; } // namespace dsp diff --git a/src/dsp/filter.hpp b/src/dsp/filter.hpp @@ -45,7 +45,7 @@ struct BiquadFilter : Filter { } } - virtual float next(float sample) override { + float next(float sample) override { _x[2] = _x[1]; _x[1] = _x[0]; _x[0] = sample; @@ -95,7 +95,7 @@ struct LowPassFilter : Filter { } void setParams(float sampleRate, float cutoff, float q); - virtual float next(float sample) override { + float next(float sample) override { return _biquad.next(sample); } }; @@ -124,7 +124,7 @@ struct MultipoleFilter : Filter { float cutoff, float ripple // FIXME: using this with more than two poles creates large gain, need compensation. ); - virtual float next(float sample) override; + float next(float sample) override; }; struct Decimator { @@ -142,8 +142,8 @@ struct LPFDecimator : Decimator { LPFDecimator(float sampleRate = 1000.0f, int factor = 8) { setParams(sampleRate, factor); } - virtual void setParams(float sampleRate, int factor) override; - virtual float next(const float* buf) override; + void setParams(float sampleRate, int factor) override; + float next(const float* buf) override; }; struct CICDecimator : Decimator { @@ -158,8 +158,8 @@ struct CICDecimator : Decimator { CICDecimator(int stages = 4, int factor = 8); virtual ~CICDecimator(); - virtual void setParams(float sampleRate, int factor) override; - virtual float next(const float* buf) override; + void setParams(float sampleRate, int factor) override; + float next(const float* buf) override; }; } // namespace dsp diff --git a/src/dsp/noise.hpp b/src/dsp/noise.hpp @@ -32,7 +32,7 @@ struct WhiteNoiseGenerator : NoiseGenerator { WhiteNoiseGenerator() : _uniform(-1.0, 1.0) {} - virtual float _next() override { + float _next() override { return _uniform(_generator); } }; @@ -44,7 +44,7 @@ struct BasePinkNoiseGenerator : NoiseGenerator { G _gs[_n]; uint32_t _count = _g.next(); - virtual float _next() override { + float _next() override { // See: http://www.firstpr.com.au/dsp/pink-noise/ float sum = _g.next(); for (int i = 0, bit = 1; i < _n; ++i, bit <<= 1) { @@ -68,7 +68,7 @@ struct BlueNoiseGenerator : NoiseGenerator { PinkNoiseGenerator _pink; float _last = 0.0f; - virtual float _next() override { + float _next() override { float t = _last; _last = _pink.next(); return _last - t; @@ -80,7 +80,7 @@ struct GaussianNoiseGenerator : NoiseGenerator { GaussianNoiseGenerator() : _normal(0, 1.0) {} - virtual float _next() override { + float _next() override { return _normal(_generator); } }; diff --git a/src/dsp/oscillator.hpp b/src/dsp/oscillator.hpp @@ -77,11 +77,11 @@ struct Phasor : OscillatorGenerator { _update(); } - virtual void _sampleRateChanged() override { + void _sampleRateChanged() override { _update(); } - virtual void _frequencyChanged() override { + void _frequencyChanged() override { _update(); } @@ -93,7 +93,7 @@ struct Phasor : OscillatorGenerator { virtual void _update(); inline void advancePhase() { _phase += _delta; } inline void advancePhase(int n) { assert(n > 0); _phase += n * _delta; } - virtual float _next() override final; + float _next() override final; virtual float _nextForPhase(phase_t phase); inline static phase_delta_t radiansToPhase(float radians) { return (radians / twoPI) * maxPhase; } @@ -115,7 +115,7 @@ struct TablePhasor : Phasor { { } - virtual float _nextForPhase(phase_t phase) override; + float _nextForPhase(phase_t phase) override; }; struct SineOscillator : OscillatorGenerator { @@ -134,17 +134,17 @@ struct SineOscillator : OscillatorGenerator { update(); } - virtual void _sampleRateChanged() override { + void _sampleRateChanged() override { update(); } - virtual void _frequencyChanged() override { + void _frequencyChanged() override { update(); } void setPhase(double phase); void update(); - virtual float _next() override; + float _next() override; }; struct SineTableOscillator : TablePhasor { @@ -166,7 +166,7 @@ struct SawOscillator : Phasor { { } - virtual float _nextForPhase(phase_t phase) override; + float _nextForPhase(phase_t phase) override; }; struct SaturatingSawOscillator : SawOscillator { @@ -185,7 +185,7 @@ struct SaturatingSawOscillator : SawOscillator { void setSaturation(float saturation); - virtual float _nextForPhase(phase_t phase) override; + float _nextForPhase(phase_t phase) override; }; struct BandLimitedSawOscillator : SaturatingSawOscillator { @@ -210,8 +210,8 @@ struct BandLimitedSawOscillator : SaturatingSawOscillator { void setQuality(int quality); - virtual void _update() override; - virtual float _nextForPhase(phase_t phase) override; + void _update() override; + float _nextForPhase(phase_t phase) override; }; struct SquareOscillator : Phasor { @@ -232,7 +232,7 @@ struct SquareOscillator : Phasor { void setPulseWidth(float pw); - virtual float _nextForPhase(phase_t phase) override; + float _nextForPhase(phase_t phase) override; }; struct BandLimitedSquareOscillator : BandLimitedSawOscillator { @@ -255,7 +255,7 @@ struct BandLimitedSquareOscillator : BandLimitedSawOscillator { void setPulseWidth(float pw); - virtual float _nextForPhase(phase_t phase) override; + float _nextForPhase(phase_t phase) override; }; struct TriangleOscillator : Phasor { @@ -270,7 +270,7 @@ struct TriangleOscillator : Phasor { { } - virtual float _nextForPhase(phase_t phase) override; + float _nextForPhase(phase_t phase) override; }; struct SineBankOscillator : Oscillator { @@ -323,8 +323,8 @@ struct SineBankOscillator : Oscillator { void syncToPhase(float phase); - virtual void _sampleRateChanged() override; - virtual void _frequencyChanged() override; + void _sampleRateChanged() override; + void _frequencyChanged() override; float next(Phasor::phase_t phaseOffset = 0.0f); }; diff --git a/src/dsp/signal.hpp b/src/dsp/signal.hpp @@ -22,7 +22,7 @@ struct Amplifier { static const float decibelsRange; struct LevelTable : Table { LevelTable(int n) : Table(n) {} - virtual void _generate() override; + void _generate() override; }; struct StaticLevelTable : StaticTable<LevelTable, 11> {}; @@ -73,7 +73,7 @@ struct RootMeanSquare : RunningAverage { { } - virtual float next(float sample) override; + float next(float sample) override; }; // Puckette 2007, "Theory and Technique" diff --git a/src/dsp/table.hpp b/src/dsp/table.hpp @@ -66,13 +66,13 @@ public: struct SineTable : Table { SineTable(int n = 10) : Table(n) {} - virtual void _generate() override; + void _generate() override; }; struct StaticSineTable : StaticTable<SineTable, 12> {}; struct BlepTable : Table { BlepTable(int n = 10) : Table(n) {} - virtual void _generate() override; + void _generate() override; }; struct StaticBlepTable : StaticTable<BlepTable, 12> {}; diff --git a/src/trigger_on_load.hpp b/src/trigger_on_load.hpp @@ -16,8 +16,8 @@ struct TriggerOnLoadModule : Module { { } - virtual json_t* toJson() override; - virtual void fromJson(json_t* root) override; + json_t* toJson() override; + void fromJson(json_t* root) override; virtual bool shouldTriggerOnNextLoad() = 0; }; diff --git a/src/widgets.hpp b/src/widgets.hpp @@ -86,7 +86,7 @@ struct VUSlider : Knob { void setVULevel(float* vuLevel) { _vuLevel = vuLevel; } - virtual void draw(NVGcontext* vg) override; + void draw(NVGcontext* vg) override; }; struct VUSlider151 : VUSlider {