Skip to content

Commit

Permalink
Warning cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
tmiw committed Aug 23, 2024
1 parent 0df5552 commit 1e473b2
Show file tree
Hide file tree
Showing 17 changed files with 51 additions and 51 deletions.
6 changes: 3 additions & 3 deletions src/pipeline/AudioPipeline.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ class AudioPipeline : public IPipelineStep
AudioPipeline(int inputSampleRate, int outputSampleRate);
virtual ~AudioPipeline();

virtual int getInputSampleRate() const;
virtual int getOutputSampleRate() const;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples);
virtual int getInputSampleRate() const override;
virtual int getOutputSampleRate() const override;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples) override;

void appendPipelineStep(std::shared_ptr<IPipelineStep> pipelineStep);

Expand Down
6 changes: 3 additions & 3 deletions src/pipeline/ComputeRfSpectrumStep.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ class ComputeRfSpectrumStep : public IPipelineStep
std::function<float*()> getAvMagFn);
virtual ~ComputeRfSpectrumStep();

virtual int getInputSampleRate() const;
virtual int getOutputSampleRate() const;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples);
virtual int getInputSampleRate() const override;
virtual int getOutputSampleRate() const override;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples) override;

private:
std::function<struct MODEM_STATS*()> modemStatsFn_;
Expand Down
6 changes: 3 additions & 3 deletions src/pipeline/EitherOrStep.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ class EitherOrStep : public IPipelineStep
EitherOrStep(std::function<bool()> conditionalFn, std::shared_ptr<IPipelineStep> trueStep, std::shared_ptr<IPipelineStep> falseStep);
virtual ~EitherOrStep();

virtual int getInputSampleRate() const;
virtual int getOutputSampleRate() const;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples);
virtual int getInputSampleRate() const override;
virtual int getOutputSampleRate() const override;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples) override;

virtual void dump(int indentLevel = 0) override;

Expand Down
6 changes: 3 additions & 3 deletions src/pipeline/EqualizerStep.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ class EqualizerStep : public IPipelineStep
EqualizerStep(int sampleRate, bool* enableFilter, void** bassFilter, void** midFilter, void** trebleFilter, void** volFilter);
virtual ~EqualizerStep();

virtual int getInputSampleRate() const;
virtual int getOutputSampleRate() const;
virtual int getInputSampleRate() const override;
virtual int getOutputSampleRate() const override;

virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples);
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples) override;

private:
int sampleRate_;
Expand Down
6 changes: 3 additions & 3 deletions src/pipeline/ExclusiveAccessStep.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ class ExclusiveAccessStep : public IPipelineStep
ExclusiveAccessStep(IPipelineStep* step, std::function<void()> lockFn, std::function<void()> unlockFn);
virtual ~ExclusiveAccessStep();

virtual int getInputSampleRate() const;
virtual int getOutputSampleRate() const;
virtual int getInputSampleRate() const override;
virtual int getOutputSampleRate() const override;

virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples);
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples) override;

virtual void dump(int indentLevel = 0) override;

Expand Down
6 changes: 3 additions & 3 deletions src/pipeline/ExternVocoderStep.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ class ExternVocoderStep : public IPipelineStep
ExternVocoderStep(std::string scriptPath, int workingSampleRate, int outputSampleRate);
virtual ~ExternVocoderStep();

virtual int getInputSampleRate() const;
virtual int getOutputSampleRate() const;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples);
virtual int getInputSampleRate() const override;
virtual int getOutputSampleRate() const override;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples) override;

private:
int sampleRate_;
Expand Down
6 changes: 3 additions & 3 deletions src/pipeline/FreeDVReceiveStep.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ class FreeDVReceiveStep : public IPipelineStep
FreeDVReceiveStep(struct freedv* dv);
virtual ~FreeDVReceiveStep();

virtual int getInputSampleRate() const;
virtual int getOutputSampleRate() const;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples);
virtual int getInputSampleRate() const override;
virtual int getOutputSampleRate() const override;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples) override;

void setSigPwrAvg(float newVal) { sigPwrAvg_ = newVal; }
float getSigPwrAvg() const { return sigPwrAvg_; }
Expand Down
6 changes: 3 additions & 3 deletions src/pipeline/FreeDVTransmitStep.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ class FreeDVTransmitStep : public IPipelineStep
FreeDVTransmitStep(struct freedv* dv, std::function<float()> getFreqOffsetFn);
virtual ~FreeDVTransmitStep();

virtual int getInputSampleRate() const;
virtual int getOutputSampleRate() const;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples);
virtual int getInputSampleRate() const override;
virtual int getOutputSampleRate() const override;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples) override;

private:
struct freedv* dv_;
Expand Down
6 changes: 3 additions & 3 deletions src/pipeline/LevelAdjustStep.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ class LevelAdjustStep : public IPipelineStep
LevelAdjustStep(int sampleRate, std::function<double()> scaleFactorFn);
virtual ~LevelAdjustStep();

virtual int getInputSampleRate() const;
virtual int getOutputSampleRate() const;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples);
virtual int getInputSampleRate() const override;
virtual int getOutputSampleRate() const override;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples) override;

private:
std::function<double()> scaleFactorFn_;
Expand Down
6 changes: 3 additions & 3 deletions src/pipeline/ParallelStep.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ class ParallelStep : public IPipelineStep
std::shared_ptr<void> state);
virtual ~ParallelStep();

virtual int getInputSampleRate() const;
virtual int getOutputSampleRate() const;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples);
virtual int getInputSampleRate() const override;
virtual int getOutputSampleRate() const override;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples) override;

const std::vector<std::shared_ptr<IPipelineStep>> getParallelSteps() const { return parallelSteps_; }

Expand Down
6 changes: 3 additions & 3 deletions src/pipeline/PlaybackStep.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ class PlaybackStep : public IPipelineStep
std::function<SNDFILE*()> getSndFileFn, std::function<void()> fileCompleteFn);
virtual ~PlaybackStep();

virtual int getInputSampleRate() const;
virtual int getOutputSampleRate() const;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples);
virtual int getInputSampleRate() const override;
virtual int getOutputSampleRate() const override;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples) override;

private:
int inputSampleRate_;
Expand Down
6 changes: 3 additions & 3 deletions src/pipeline/RecordStep.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ class RecordStep : public IPipelineStep
int inputSampleRate, std::function<SNDFILE*()> getSndFileFn, std::function<void(int)> isFileCompleteFn);
virtual ~RecordStep();

virtual int getInputSampleRate() const;
virtual int getOutputSampleRate() const;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples);
virtual int getInputSampleRate() const override;
virtual int getOutputSampleRate() const override;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples) override;

private:
int inputSampleRate_;
Expand Down
6 changes: 3 additions & 3 deletions src/pipeline/ResamplePlotStep.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ class ResampleForPlotStep : public IPipelineStep
ResampleForPlotStep(struct FIFO* fifo);
virtual ~ResampleForPlotStep();

virtual int getInputSampleRate() const;
virtual int getOutputSampleRate() const;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples);
virtual int getInputSampleRate() const override;
virtual int getOutputSampleRate() const override;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples) override;

private:
struct FIFO* fifo_;
Expand Down
6 changes: 3 additions & 3 deletions src/pipeline/ResampleStep.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ class ResampleStep : public IPipelineStep
ResampleStep(int inputSampleRate, int outputSampleRate);
virtual ~ResampleStep();

virtual int getInputSampleRate() const;
virtual int getOutputSampleRate() const;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples);
virtual int getInputSampleRate() const override;
virtual int getOutputSampleRate() const override;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples) override;

private:
int inputSampleRate_;
Expand Down
6 changes: 3 additions & 3 deletions src/pipeline/SpeexStep.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ class SpeexStep : public IPipelineStep
SpeexStep(int sampleRate);
virtual ~SpeexStep();

virtual int getInputSampleRate() const;
virtual int getOutputSampleRate() const;
virtual int getInputSampleRate() const override;
virtual int getOutputSampleRate() const override;

virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples);
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples) override;

private:
int sampleRate_;
Expand Down
6 changes: 3 additions & 3 deletions src/pipeline/TapStep.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ class TapStep : public IPipelineStep
TapStep(int inputSampleRate, IPipelineStep* tapStep);
virtual ~TapStep();

virtual int getInputSampleRate() const;
virtual int getOutputSampleRate() const;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples);
virtual int getInputSampleRate() const override;
virtual int getOutputSampleRate() const override;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples) override;

virtual void dump(int indentLevel = 0) override;

Expand Down
6 changes: 3 additions & 3 deletions src/pipeline/ToneInterfererStep.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ class ToneInterfererStep : public IPipelineStep
std::function<float()> toneAmplitudeFn, std::function<float*()> tonePhaseFn);
virtual ~ToneInterfererStep();

virtual int getInputSampleRate() const;
virtual int getOutputSampleRate() const;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples);
virtual int getInputSampleRate() const override;
virtual int getOutputSampleRate() const override;
virtual std::shared_ptr<short> execute(std::shared_ptr<short> inputSamples, int numInputSamples, int* numOutputSamples) override;

private:
int sampleRate_;
Expand Down

0 comments on commit 1e473b2

Please sign in to comment.