diff options
author | Max Kellermann <max@duempel.org> | 2014-12-26 14:26:31 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2014-12-26 14:28:52 +0100 |
commit | 940cab8620428f21e6d0c9f4b11893b1f44ce610 (patch) | |
tree | 9b4771f1fce4e0e95f1507f021aa7587b7ba366d /src/filter | |
parent | 5b84c99d793bf9b78cf28b462593775c32a3ce83 (diff) | |
parent | 665031467a55a32be306191514ac81f73ac41de7 (diff) | |
download | mpd-940cab8620428f21e6d0c9f4b11893b1f44ce610.tar.gz mpd-940cab8620428f21e6d0c9f4b11893b1f44ce610.tar.xz mpd-940cab8620428f21e6d0c9f4b11893b1f44ce610.zip |
Merge branch 'v0.18.x' into v0.19.x
Diffstat (limited to 'src/filter')
-rw-r--r-- | src/filter/plugins/ChainFilterPlugin.cxx | 9 | ||||
-rw-r--r-- | src/filter/plugins/NormalizeFilterPlugin.cxx | 9 | ||||
-rw-r--r-- | src/filter/plugins/ReplayGainFilterPlugin.cxx | 9 | ||||
-rw-r--r-- | src/filter/plugins/RouteFilterPlugin.cxx | 9 | ||||
-rw-r--r-- | src/filter/plugins/VolumeFilterPlugin.cxx | 9 |
5 files changed, 25 insertions, 20 deletions
diff --git a/src/filter/plugins/ChainFilterPlugin.cxx b/src/filter/plugins/ChainFilterPlugin.cxx index 7342beb14..4aeee69af 100644 --- a/src/filter/plugins/ChainFilterPlugin.cxx +++ b/src/filter/plugins/ChainFilterPlugin.cxx @@ -53,10 +53,11 @@ public: children.emplace_back(name, filter); } - virtual AudioFormat Open(AudioFormat &af, Error &error) override; - virtual void Close(); - virtual ConstBuffer<void> FilterPCM(ConstBuffer<void> src, - Error &error); + /* virtual methods from class Filter */ + AudioFormat Open(AudioFormat &af, Error &error) override; + void Close() override; + ConstBuffer<void> FilterPCM(ConstBuffer<void> src, + Error &error) override; private: /** diff --git a/src/filter/plugins/NormalizeFilterPlugin.cxx b/src/filter/plugins/NormalizeFilterPlugin.cxx index a69df2b81..372ab53ac 100644 --- a/src/filter/plugins/NormalizeFilterPlugin.cxx +++ b/src/filter/plugins/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 ConstBuffer<void> FilterPCM(ConstBuffer<void> src, - Error &error) override; + /* virtual methods from class Filter */ + AudioFormat Open(AudioFormat &af, Error &error) override; + void Close() override; + ConstBuffer<void> FilterPCM(ConstBuffer<void> src, + Error &error) override; }; static Filter * diff --git a/src/filter/plugins/ReplayGainFilterPlugin.cxx b/src/filter/plugins/ReplayGainFilterPlugin.cxx index 651352ac9..f76e48e37 100644 --- a/src/filter/plugins/ReplayGainFilterPlugin.cxx +++ b/src/filter/plugins/ReplayGainFilterPlugin.cxx @@ -112,10 +112,11 @@ public: */ void Update(); - virtual AudioFormat Open(AudioFormat &af, Error &error) override; - virtual void Close(); - virtual ConstBuffer<void> FilterPCM(ConstBuffer<void> src, - Error &error) override; + /* virtual methods from class Filter */ + AudioFormat Open(AudioFormat &af, Error &error) override; + void Close() override; + ConstBuffer<void> FilterPCM(ConstBuffer<void> src, + Error &error) override; }; void diff --git a/src/filter/plugins/RouteFilterPlugin.cxx b/src/filter/plugins/RouteFilterPlugin.cxx index a252af97d..4094119f2 100644 --- a/src/filter/plugins/RouteFilterPlugin.cxx +++ b/src/filter/plugins/RouteFilterPlugin.cxx @@ -120,10 +120,11 @@ public: */ bool Configure(const config_param ¶m, Error &error); - virtual AudioFormat Open(AudioFormat &af, Error &error) override; - virtual void Close(); - virtual ConstBuffer<void> FilterPCM(ConstBuffer<void> src, - Error &error) override; + /* virtual methods from class Filter */ + AudioFormat Open(AudioFormat &af, Error &error) override; + void Close() override; + ConstBuffer<void> FilterPCM(ConstBuffer<void> src, + Error &error) override; }; bool diff --git a/src/filter/plugins/VolumeFilterPlugin.cxx b/src/filter/plugins/VolumeFilterPlugin.cxx index 7b6ccc51e..17e061476 100644 --- a/src/filter/plugins/VolumeFilterPlugin.cxx +++ b/src/filter/plugins/VolumeFilterPlugin.cxx @@ -43,10 +43,11 @@ public: pv.SetVolume(_volume); } - virtual AudioFormat Open(AudioFormat &af, Error &error) override; - virtual void Close(); - virtual ConstBuffer<void> FilterPCM(ConstBuffer<void> src, - Error &error) override; + /* virtual methods from class Filter */ + AudioFormat Open(AudioFormat &af, Error &error) override; + void Close() override; + ConstBuffer<void> FilterPCM(ConstBuffer<void> src, + Error &error) override; }; static constexpr Domain volume_domain("pcm_volume"); |