Commit df331711 authored by Max Kellermann's avatar Max Kellermann

db/{simple,proxy}, ...: add "override" keywords

Fixes -Winconsistent-missing-override (clang 3.6).
parent 53f40448
...@@ -57,7 +57,7 @@ public: ...@@ -57,7 +57,7 @@ public:
virtual void Close() override; virtual void Close() override;
virtual Song *GetSong(const char *uri_utf8, virtual Song *GetSong(const char *uri_utf8,
Error &error) const override; Error &error) const override;
virtual void ReturnSong(Song *song) const; void ReturnSong(Song *song) const override;
virtual bool Visit(const DatabaseSelection &selection, virtual bool Visit(const DatabaseSelection &selection,
VisitDirectory visit_directory, VisitDirectory visit_directory,
......
...@@ -61,7 +61,7 @@ public: ...@@ -61,7 +61,7 @@ public:
virtual Song *GetSong(const char *uri_utf8, virtual Song *GetSong(const char *uri_utf8,
Error &error) const override; Error &error) const override;
virtual void ReturnSong(Song *song) const; void ReturnSong(Song *song) const override;
virtual bool Visit(const DatabaseSelection &selection, virtual bool Visit(const DatabaseSelection &selection,
VisitDirectory visit_directory, VisitDirectory visit_directory,
......
...@@ -52,10 +52,11 @@ public: ...@@ -52,10 +52,11 @@ public:
children.emplace_back(name, filter); children.emplace_back(name, filter);
} }
virtual AudioFormat Open(AudioFormat &af, Error &error) override; /* virtual methods from class Filter */
virtual void Close(); AudioFormat Open(AudioFormat &af, Error &error) override;
virtual const void *FilterPCM(const void *src, size_t src_size, void Close() override;
size_t *dest_size_r, Error &error); const void *FilterPCM(const void *src, size_t src_size,
size_t *dest_size_r, Error &error) override;
private: private:
/** /**
......
...@@ -34,10 +34,11 @@ class NormalizeFilter final : public Filter { ...@@ -34,10 +34,11 @@ class NormalizeFilter final : public Filter {
PcmBuffer buffer; PcmBuffer buffer;
public: public:
virtual AudioFormat Open(AudioFormat &af, Error &error) override; /* virtual methods from class Filter */
virtual void Close(); AudioFormat Open(AudioFormat &af, Error &error) override;
virtual const void *FilterPCM(const void *src, size_t src_size, void Close() override;
size_t *dest_size_r, Error &error); const void *FilterPCM(const void *src, size_t src_size,
size_t *dest_size_r, Error &error) override;
}; };
static Filter * static Filter *
......
...@@ -116,10 +116,11 @@ public: ...@@ -116,10 +116,11 @@ public:
*/ */
void Update(); void Update();
virtual AudioFormat Open(AudioFormat &af, Error &error) override; /* virtual methods from class Filter */
virtual void Close(); AudioFormat Open(AudioFormat &af, Error &error) override;
virtual const void *FilterPCM(const void *src, size_t src_size, void Close() override;
size_t *dest_size_r, Error &error); const void *FilterPCM(const void *src, size_t src_size,
size_t *dest_size_r, Error &error) override;
}; };
void void
......
...@@ -120,10 +120,11 @@ public: ...@@ -120,10 +120,11 @@ public:
*/ */
bool Configure(const config_param &param, Error &error); bool Configure(const config_param &param, Error &error);
virtual AudioFormat Open(AudioFormat &af, Error &error) override; /* virtual methods from class Filter */
virtual void Close(); AudioFormat Open(AudioFormat &af, Error &error) override;
virtual const void *FilterPCM(const void *src, size_t src_size, void Close() override;
size_t *dest_size_r, Error &error); const void *FilterPCM(const void *src, size_t src_size,
size_t *dest_size_r, Error &error) override;
}; };
bool bool
......
...@@ -57,10 +57,10 @@ public: ...@@ -57,10 +57,10 @@ public:
volume = _volume; volume = _volume;
} }
virtual AudioFormat Open(AudioFormat &af, Error &error) override; AudioFormat Open(AudioFormat &af, Error &error) override;
virtual void Close(); void Close() override;
virtual const void *FilterPCM(const void *src, size_t src_size, const void *FilterPCM(const void *src, size_t src_size,
size_t *dest_size_r, Error &error); size_t *dest_size_r, Error &error) override;
}; };
static constexpr Domain volume_domain("pcm_volume"); static constexpr Domain volume_domain("pcm_volume");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment