aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-12-26 13:46:07 +0100
committerMax Kellermann <max@duempel.org>2014-12-26 13:47:04 +0100
commitdf3317110766f659b6cc3e80b61c5fd88c4ce6b3 (patch)
treef1f49b31a52d2c5e0bc1dd4025232751655c72f8 /src
parent53f40448901ffe0d953c81939d031c63cdf3779a (diff)
downloadmpd-df3317110766f659b6cc3e80b61c5fd88c4ce6b3.tar.gz
mpd-df3317110766f659b6cc3e80b61c5fd88c4ce6b3.tar.xz
mpd-df3317110766f659b6cc3e80b61c5fd88c4ce6b3.zip
db/{simple,proxy}, ...: add "override" keywords
Fixes -Winconsistent-missing-override (clang 3.6).
Diffstat (limited to 'src')
-rw-r--r--src/db/ProxyDatabasePlugin.cxx2
-rw-r--r--src/db/SimpleDatabasePlugin.hxx2
-rw-r--r--src/filter/ChainFilterPlugin.cxx9
-rw-r--r--src/filter/NormalizeFilterPlugin.cxx9
-rw-r--r--src/filter/ReplayGainFilterPlugin.cxx9
-rw-r--r--src/filter/RouteFilterPlugin.cxx9
-rw-r--r--src/filter/VolumeFilterPlugin.cxx8
7 files changed, 26 insertions, 22 deletions
diff --git a/src/db/ProxyDatabasePlugin.cxx b/src/db/ProxyDatabasePlugin.cxx
index cb1bcdc6b..92fe6ebac 100644
--- a/src/db/ProxyDatabasePlugin.cxx
+++ b/src/db/ProxyDatabasePlugin.cxx
@@ -57,7 +57,7 @@ public:
virtual void Close() override;
virtual Song *GetSong(const char *uri_utf8,
Error &error) const override;
- virtual void ReturnSong(Song *song) const;
+ void ReturnSong(Song *song) const override;
virtual bool Visit(const DatabaseSelection &selection,
VisitDirectory visit_directory,
diff --git a/src/db/SimpleDatabasePlugin.hxx b/src/db/SimpleDatabasePlugin.hxx
index dfe981dd8..6424feaa6 100644
--- a/src/db/SimpleDatabasePlugin.hxx
+++ b/src/db/SimpleDatabasePlugin.hxx
@@ -61,7 +61,7 @@ public:
virtual Song *GetSong(const char *uri_utf8,
Error &error) const override;
- virtual void ReturnSong(Song *song) const;
+ void ReturnSong(Song *song) const override;
virtual bool Visit(const DatabaseSelection &selection,
VisitDirectory visit_directory,
diff --git a/src/filter/ChainFilterPlugin.cxx b/src/filter/ChainFilterPlugin.cxx
index cb52b86ca..b000d53ce 100644
--- a/src/filter/ChainFilterPlugin.cxx
+++ b/src/filter/ChainFilterPlugin.cxx
@@ -52,10 +52,11 @@ public:
children.emplace_back(name, filter);
}
- virtual AudioFormat Open(AudioFormat &af, Error &error) override;
- virtual void Close();
- virtual const void *FilterPCM(const void *src, size_t src_size,
- size_t *dest_size_r, Error &error);
+ /* virtual methods from class Filter */
+ AudioFormat Open(AudioFormat &af, Error &error) override;
+ void Close() override;
+ const void *FilterPCM(const void *src, size_t src_size,
+ size_t *dest_size_r, Error &error) override;
private:
/**
diff --git a/src/filter/NormalizeFilterPlugin.cxx b/src/filter/NormalizeFilterPlugin.cxx
index 6c4f6b0e5..60d0f3204 100644
--- a/src/filter/NormalizeFilterPlugin.cxx
+++ b/src/filter/NormalizeFilterPlugin.cxx
@@ -34,10 +34,11 @@ class NormalizeFilter final : public Filter {
PcmBuffer buffer;
public:
- virtual AudioFormat Open(AudioFormat &af, Error &error) override;
- virtual void Close();
- virtual const void *FilterPCM(const void *src, size_t src_size,
- size_t *dest_size_r, Error &error);
+ /* virtual methods from class Filter */
+ AudioFormat Open(AudioFormat &af, Error &error) override;
+ void Close() override;
+ const void *FilterPCM(const void *src, size_t src_size,
+ size_t *dest_size_r, Error &error) override;
};
static Filter *
diff --git a/src/filter/ReplayGainFilterPlugin.cxx b/src/filter/ReplayGainFilterPlugin.cxx
index b2dcde4cc..b79b4fb87 100644
--- a/src/filter/ReplayGainFilterPlugin.cxx
+++ b/src/filter/ReplayGainFilterPlugin.cxx
@@ -116,10 +116,11 @@ public:
*/
void Update();
- virtual AudioFormat Open(AudioFormat &af, Error &error) override;
- virtual void Close();
- virtual const void *FilterPCM(const void *src, size_t src_size,
- size_t *dest_size_r, Error &error);
+ /* virtual methods from class Filter */
+ AudioFormat Open(AudioFormat &af, Error &error) override;
+ void Close() override;
+ const void *FilterPCM(const void *src, size_t src_size,
+ size_t *dest_size_r, Error &error) override;
};
void
diff --git a/src/filter/RouteFilterPlugin.cxx b/src/filter/RouteFilterPlugin.cxx
index d9042c21f..335cfe6bd 100644
--- a/src/filter/RouteFilterPlugin.cxx
+++ b/src/filter/RouteFilterPlugin.cxx
@@ -120,10 +120,11 @@ public:
*/
bool Configure(const config_param &param, Error &error);
- virtual AudioFormat Open(AudioFormat &af, Error &error) override;
- virtual void Close();
- virtual const void *FilterPCM(const void *src, size_t src_size,
- size_t *dest_size_r, Error &error);
+ /* virtual methods from class Filter */
+ AudioFormat Open(AudioFormat &af, Error &error) override;
+ void Close() override;
+ const void *FilterPCM(const void *src, size_t src_size,
+ size_t *dest_size_r, Error &error) override;
};
bool
diff --git a/src/filter/VolumeFilterPlugin.cxx b/src/filter/VolumeFilterPlugin.cxx
index 1b663f6eb..66afdea88 100644
--- a/src/filter/VolumeFilterPlugin.cxx
+++ b/src/filter/VolumeFilterPlugin.cxx
@@ -57,10 +57,10 @@ public:
volume = _volume;
}
- virtual AudioFormat Open(AudioFormat &af, Error &error) override;
- virtual void Close();
- virtual const void *FilterPCM(const void *src, size_t src_size,
- size_t *dest_size_r, Error &error);
+ AudioFormat Open(AudioFormat &af, Error &error) override;
+ void Close() override;
+ const void *FilterPCM(const void *src, size_t src_size,
+ size_t *dest_size_r, Error &error) override;
};
static constexpr Domain volume_domain("pcm_volume");