From 870436a592b081c4630b9ecc36ff8daecf6496cc Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 14 Dec 2009 21:36:25 +0100 Subject: output_init: use the normalize filter plugin Use the plugin instead of the glue code in normalize.c. This is used wrapped inside a "autoconv" filter, to enable normalization for all input file formats. --- src/normalize.c | 54 ------------------------------------------------------ 1 file changed, 54 deletions(-) delete mode 100644 src/normalize.c (limited to 'src/normalize.c') diff --git a/src/normalize.c b/src/normalize.c deleted file mode 100644 index 1c8173def..000000000 --- a/src/normalize.c +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2003-2009 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. - */ - -#include "config.h" -#include "normalize.h" -#include "AudioCompress/compress.h" -#include "conf.h" -#include "audio_format.h" - -#define DEFAULT_VOLUME_NORMALIZATION 0 - -int normalizationEnabled; - -static struct Compressor *compressor; - -void initNormalization(void) -{ - normalizationEnabled = config_get_bool(CONF_VOLUME_NORMALIZATION, - DEFAULT_VOLUME_NORMALIZATION); - - if (normalizationEnabled) - compressor = Compressor_new(0); -} - -void finishNormalization(void) -{ - if (normalizationEnabled) - Compressor_delete(compressor); -} - -void normalizeData(void *buffer, int bufferSize, - const struct audio_format *format) -{ - if (format->format != SAMPLE_FORMAT_S16 || format->channels != 2) - return; - - Compressor_Process_int16(compressor, buffer, bufferSize / 2); -} -- cgit v1.2.3