diff options
author | Max Kellermann <max@musicpd.org> | 2017-12-27 11:33:15 +0100 |
---|---|---|
committer | Max Kellermann <max@musicpd.org> | 2017-12-27 11:33:15 +0100 |
commit | b335ac41560f32d07651a228a3c26055233e29e4 (patch) | |
tree | cbae73eb0d4d34e1751f529c0e2404977e60158e | |
parent | 03cf6591c0d688dc3303ae73ee088a82fb216882 (diff) |
filter/{chain,convert}: remove unused FilterPlugin instances
These are not in filter_plugins[] and have dedicated constructors
anyway.
-rw-r--r-- | src/filter/FilterRegistry.hxx | 2 | ||||
-rw-r--r-- | src/filter/plugins/ChainFilterPlugin.cxx | 13 | ||||
-rw-r--r-- | src/filter/plugins/ConvertFilterPlugin.cxx | 13 |
3 files changed, 0 insertions, 28 deletions
diff --git a/src/filter/FilterRegistry.hxx b/src/filter/FilterRegistry.hxx index e014ed322..dbc734683 100644 --- a/src/filter/FilterRegistry.hxx +++ b/src/filter/FilterRegistry.hxx @@ -31,8 +31,6 @@ struct FilterPlugin; extern const FilterPlugin null_filter_plugin; -extern const FilterPlugin chain_filter_plugin; -extern const FilterPlugin convert_filter_plugin; extern const FilterPlugin route_filter_plugin; extern const FilterPlugin normalize_filter_plugin; extern const FilterPlugin volume_filter_plugin; diff --git a/src/filter/plugins/ChainFilterPlugin.cxx b/src/filter/plugins/ChainFilterPlugin.cxx index d7c3525ee..b3ac2fdbf 100644 --- a/src/filter/plugins/ChainFilterPlugin.cxx +++ b/src/filter/plugins/ChainFilterPlugin.cxx @@ -19,9 +19,7 @@ #include "config.h" #include "ChainFilterPlugin.hxx" -#include "filter/FilterPlugin.hxx" #include "filter/FilterInternal.hxx" -#include "filter/FilterRegistry.hxx" #include "AudioFormat.hxx" #include "util/ConstBuffer.hxx" #include "util/StringBuffer.hxx" @@ -94,12 +92,6 @@ public: Filter *Open(AudioFormat &af) override; }; -static PreparedFilter * -chain_filter_init(gcc_unused const ConfigBlock &block) -{ - return new PreparedChainFilter(); -} - Filter * PreparedChainFilter::Child::Open(const AudioFormat &prev_audio_format) { @@ -151,11 +143,6 @@ ChainFilter::FilterPCM(ConstBuffer<void> src) return src; } -const FilterPlugin chain_filter_plugin = { - "chain", - chain_filter_init, -}; - PreparedFilter * filter_chain_new(void) { diff --git a/src/filter/plugins/ConvertFilterPlugin.cxx b/src/filter/plugins/ConvertFilterPlugin.cxx index 260e826f6..dc6fedf82 100644 --- a/src/filter/plugins/ConvertFilterPlugin.cxx +++ b/src/filter/plugins/ConvertFilterPlugin.cxx @@ -19,9 +19,7 @@ #include "config.h" #include "ConvertFilterPlugin.hxx" -#include "filter/FilterPlugin.hxx" #include "filter/FilterInternal.hxx" -#include "filter/FilterRegistry.hxx" #include "pcm/PcmConvert.hxx" #include "util/Manual.hxx" #include "util/ConstBuffer.hxx" @@ -64,12 +62,6 @@ public: Filter *Open(AudioFormat &af) override; }; -static PreparedFilter * -convert_filter_init(gcc_unused const ConfigBlock &block) -{ - return new PreparedConvertFilter(); -} - void ConvertFilter::Set(const AudioFormat &_out_audio_format) { @@ -127,11 +119,6 @@ ConvertFilter::FilterPCM(ConstBuffer<void> src) return state.Convert(src); } -const FilterPlugin convert_filter_plugin = { - "convert", - convert_filter_init, -}; - PreparedFilter * convert_filter_prepare() noexcept { |