aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2018-01-14 07:10:35 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2018-01-14 07:10:35 +0100
commitd929ecf1e0196161acb5a106761e8fad7040e9d3 (patch)
treebb845782b679cabc4475a66a727145d949905a78
parentb48fb779024138a760b5c6309d097b712d2bb853 (diff)
downloaddabmod-d929ecf1e0196161acb5a106761e8fad7040e9d3.tar.gz
dabmod-d929ecf1e0196161acb5a106761e8fad7040e9d3.tar.bz2
dabmod-d929ecf1e0196161acb5a106761e8fad7040e9d3.zip
Make ~PipelinedModcodec virtual, simplify GainControl and FIRFilter declarations
-rw-r--r--src/FIRFilter.h10
-rw-r--r--src/GainControl.cpp4
-rw-r--r--src/GainControl.h6
-rw-r--r--src/ModPlugin.h3
4 files changed, 9 insertions, 14 deletions
diff --git a/src/FIRFilter.h b/src/FIRFilter.h
index a63bfb9..6ace338 100644
--- a/src/FIRFilter.h
+++ b/src/FIRFilter.h
@@ -53,20 +53,18 @@ class FIRFilter : public PipelinedModCodec, public RemoteControllable
{
public:
FIRFilter(const std::string& taps_file);
- virtual ~FIRFilter() = default;
- const char* name() { return "FIRFilter"; }
+ const char* name() override { return "FIRFilter"; }
/******* REMOTE CONTROL ********/
virtual void set_parameter(const std::string& parameter,
- const std::string& value);
+ const std::string& value) override;
virtual const std::string get_parameter(
- const std::string& parameter) const;
-
+ const std::string& parameter) const override;
protected:
- virtual int internal_process(Buffer* const dataIn, Buffer* dataOut);
+ virtual int internal_process(Buffer* const dataIn, Buffer* dataOut) override;
void load_filter_taps(const std::string &tapsFile);
std::string m_taps_file;
diff --git a/src/GainControl.cpp b/src/GainControl.cpp
index 0411482..dbb9464 100644
--- a/src/GainControl.cpp
+++ b/src/GainControl.cpp
@@ -73,10 +73,6 @@ GainControl::GainControl(size_t framesize,
start_pipeline_thread();
}
-GainControl::~GainControl()
-{
- PDEBUG("GainControl::~GainControl() @ %p\n", this);
-}
int GainControl::internal_process(Buffer* const dataIn, Buffer* dataOut)
{
diff --git a/src/GainControl.h b/src/GainControl.h
index e9eaa8c..92c905b 100644
--- a/src/GainControl.h
+++ b/src/GainControl.h
@@ -56,9 +56,9 @@ class GainControl : public PipelinedModCodec, public RemoteControllable
float normalise,
float varVariance);
- virtual ~GainControl();
- GainControl(const GainControl&);
- GainControl& operator=(const GainControl&);
+ virtual ~GainControl() = default;
+ GainControl(const GainControl&) = delete;
+ GainControl& operator=(const GainControl&) = delete;
const char* name() override { return "GainControl"; }
diff --git a/src/ModPlugin.h b/src/ModPlugin.h
index c0f1c1a..5635fca 100644
--- a/src/ModPlugin.h
+++ b/src/ModPlugin.h
@@ -65,6 +65,7 @@ public:
std::vector<Buffer*> dataIn,
std::vector<Buffer*> dataOut) = 0;
virtual const char* name() = 0;
+ virtual ~ModPlugin() = default;
};
/* Inputs are sources, the output buffers without reading any */
@@ -99,7 +100,7 @@ public:
PipelinedModCodec& operator=(const PipelinedModCodec&) = delete;
PipelinedModCodec(PipelinedModCodec&&) = delete;
PipelinedModCodec& operator=(PipelinedModCodec&&) = delete;
- ~PipelinedModCodec();
+ virtual ~PipelinedModCodec();
virtual int process(Buffer* const dataIn, Buffer* dataOut) final;
virtual const char* name() = 0;