oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

filter/Normalize: add normalize_filter_prepare()

Browse Source
This commit is contained in:
Max Kellermann 2017-08-07 18:28:52 +02:00
parent a3d71f4b91
commit b8be7ec90e
4 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -1636,6 +1636,7 @@ libfilter_plugins_a_SOURCES = \
src/filter/plugins/ConvertFilterPlugin.hxx \
src/filter/plugins/RouteFilterPlugin.cxx \
src/filter/plugins/NormalizeFilterPlugin.cxx \
src/filter/plugins/NormalizeFilterPlugin.hxx \
src/filter/plugins/ReplayGainFilterPlugin.cxx \
src/filter/plugins/ReplayGainFilterPlugin.hxx \
src/filter/plugins/VolumeFilterPlugin.cxx \

7
src/filter/plugins/NormalizeFilterPlugin.cxx
View File

@ -18,6 +18,7 @@
*/
#include "config.h"
#include "NormalizeFilterPlugin.hxx"
#include "filter/FilterPlugin.hxx"
#include "filter/FilterInternal.hxx"
#include "filter/FilterRegistry.hxx"
@ -80,3 +81,9 @@ const FilterPlugin normalize_filter_plugin = {
"normalize",
normalize_filter_init,
};
PreparedFilter *
normalize_filter_prepare() noexcept
{
return new PreparedNormalizeFilter();
}

30
src/filter/plugins/NormalizeFilterPlugin.hxx Normal file
View File

@ -0,0 +1,30 @@
/*
* Copyright 2003-2017 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_NORMALIZE_FILTER_PLUGIN_HXX
#define MPD_NORMALIZE_FILTER_PLUGIN_HXX
class PreparedFilter;
class Filter;
struct AudioFormat;
PreparedFilter *
normalize_filter_prepare() noexcept;
#endif

9
src/output/Init.cxx
View File

@ -28,13 +28,12 @@
#include "mixer/MixerType.hxx"
#include "mixer/MixerControl.hxx"
#include "mixer/plugins/SoftwareMixerPlugin.hxx"
#include "filter/FilterPlugin.hxx"
#include "filter/FilterRegistry.hxx"
#include "filter/plugins/AutoConvertFilterPlugin.hxx"
#include "filter/plugins/ConvertFilterPlugin.hxx"
#include "filter/plugins/ReplayGainFilterPlugin.hxx"
#include "filter/plugins/ChainFilterPlugin.hxx"
#include "filter/plugins/VolumeFilterPlugin.hxx"
#include "filter/plugins/NormalizeFilterPlugin.hxx"
#include "config/ConfigError.hxx"
#include "config/ConfigGlobal.hxx"
#include "config/Block.hxx"
@ -175,12 +174,8 @@ AudioOutput::Configure(const ConfigBlock &block)
/* create the normalization filter (if configured) */
if (config_get_bool(ConfigOption::VOLUME_NORMALIZATION, false)) {
auto *normalize_filter =
filter_new(&normalize_filter_plugin, ConfigBlock());
assert(normalize_filter != nullptr);
filter_chain_append(*prepared_filter, "normalize",
autoconvert_filter_new(normalize_filter));
autoconvert_filter_new(normalize_filter_prepare()));
}
try {