From f6b6c58a8181488f135c66226d1f9b991de52e3d Mon Sep 17 00:00:00 2001 From: Damien Zammit Date: Wed, 13 May 2015 22:27:11 +1000 Subject: Minor compiler warning fixes Signed-off-by: Damien Zammit --- plugins/ZamChild670/ZamChild670UI.cpp | 2 +- plugins/ZamChild670/sidechainamplifier.h | 2 +- plugins/ZamChild670/tubemodel.h | 6 +++--- plugins/ZamChild670/wavechild670.h | 9 +++++---- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/plugins/ZamChild670/ZamChild670UI.cpp b/plugins/ZamChild670/ZamChild670UI.cpp index cf7b9de..8416781 100644 --- a/plugins/ZamChild670/ZamChild670UI.cpp +++ b/plugins/ZamChild670/ZamChild670UI.cpp @@ -92,7 +92,7 @@ void ZamChild670UI::d_parameterChanged(uint32_t index, float value) } } -void ZamChild670UI::d_programChanged(uint32_t index) +void ZamChild670UI::d_programChanged(uint32_t) { // Default values fKnobIngain->setValue(-12.0f); diff --git a/plugins/ZamChild670/sidechainamplifier.h b/plugins/ZamChild670/sidechainamplifier.h index 4972c46..351dbe2 100644 --- a/plugins/ZamChild670/sidechainamplifier.h +++ b/plugins/ZamChild670/sidechainamplifier.h @@ -109,7 +109,7 @@ protected: // return i; // } - inline Real getDriveStageCurrent(Real Vdiff, Real Vcap) { + inline Real getDriveStageCurrent(Real Vdiff, Real) { Assert(isfinite(Vdiff)); Assert(isfinite(Vcap)); Real current = diodeModel(Vdiff) * nominalOutputConductance; diff --git a/plugins/ZamChild670/tubemodel.h b/plugins/ZamChild670/tubemodel.h index c146fe1..0159cb5 100644 --- a/plugins/ZamChild670/tubemodel.h +++ b/plugins/ZamChild670/tubemodel.h @@ -33,16 +33,16 @@ class TriodeModel { public: TriodeModel() {} virtual ~TriodeModel() {} - virtual Real getIa(Real Vgk, Real Vak) { + virtual Real getIa(Real, Real) { return 0.0; } - virtual Real getIg(Real Vgk, Real Vak) { + virtual Real getIg(Real, Real) { return 0.0; } virtual TriodeModel* clone() const { return new TriodeModel(*this); } private: - TriodeModel(const TriodeModel& other) { } + TriodeModel(const TriodeModel&) { } }; class TriodeRemoteCutoff6386 : public TriodeModel { diff --git a/plugins/ZamChild670/wavechild670.h b/plugins/ZamChild670/wavechild670.h index cef6737..ba37a48 100644 --- a/plugins/ZamChild670/wavechild670.h +++ b/plugins/ZamChild670/wavechild670.h @@ -114,14 +114,15 @@ public: } virtual void warmUp(Real warmUpTimeInSeconds=0.5){ + Real VoutA, VoutB; ulong numSamples = (ulong) warmUpTimeInSeconds*sampleRate; for (ulong i = 0; i < numSamples/2; i += 1) { - Real VoutA = signalAmplifierA.advanceAndGetOutputVoltage(0.0, VlevelCapA); - Real VoutB = signalAmplifierB.advanceAndGetOutputVoltage(0.0, VlevelCapB); + VoutA = signalAmplifierA.advanceAndGetOutputVoltage(0.0, VlevelCapA); + VoutB = signalAmplifierB.advanceAndGetOutputVoltage(0.0, VlevelCapB); } for (ulong i = 0; i < numSamples/2; i += 1) { - Real VoutA = signalAmplifierA.advanceAndGetOutputVoltage(0.0, VlevelCapA); - Real VoutB = signalAmplifierB.advanceAndGetOutputVoltage(0.0, VlevelCapB); + VoutA = signalAmplifierA.advanceAndGetOutputVoltage(0.0, VlevelCapA); + VoutB = signalAmplifierB.advanceAndGetOutputVoltage(0.0, VlevelCapB); advanceSidechain(VoutA, VoutB); //Feedback topology with implicit unit delay between the sidechain input and the output, } } -- cgit v1.2.3