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

filter/replay_gain: convert to C++

Browse Source
This commit is contained in:
Max Kellermann 2013-01-07 10:12:51 +01:00
parent 975370c084
commit 989c9a7317
6 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -59,7 +59,6 @@ mpd_headers = \
src/filter/autoconvert_filter_plugin.h \
src/filter/chain_filter_plugin.h \
src/filter/convert_filter_plugin.h \
src/filter/replay_gain_filter_plugin.h \
src/filter/volume_filter_plugin.h \
src/command.h \
src/idle.h \
@ -951,7 +950,8 @@ libfilter_plugins_a_SOURCES = \
src/filter/convert_filter_plugin.c \
src/filter/route_filter_plugin.c \
src/filter/normalize_filter_plugin.c \
src/filter/replay_gain_filter_plugin.c \
src/filter/ReplayGainFilterPlugin.cxx \
src/filter/ReplayGainFilterPlugin.hxx \
src/filter/volume_filter_plugin.c
FILTER_LIBS = \

2
src/OutputControl.cxx
View File

@ -27,9 +27,9 @@ extern "C" {
#include "mixer_control.h"
#include "mixer_plugin.h"
#include "notify.h"
#include "filter/replay_gain_filter_plugin.h"
}
#include "filter/ReplayGainFilterPlugin.hxx"
#include "filter_plugin.h"
#include <assert.h>

3
src/OutputInit.cxx
View File

@ -34,9 +34,10 @@ extern "C" {
#include "filter_config.h"
#include "filter/chain_filter_plugin.h"
#include "filter/autoconvert_filter_plugin.h"
#include "filter/replay_gain_filter_plugin.h"
}
#include "filter/ReplayGainFilterPlugin.hxx"
#include <glib.h>
#include <assert.h>

2
src/OutputThread.cxx
View File

@ -26,10 +26,10 @@ extern "C" {
#include "pcm_mix.h"
#include "filter_plugin.h"
#include "filter/convert_filter_plugin.h"
#include "filter/replay_gain_filter_plugin.h"
#include "notify.h"
}
#include "filter/ReplayGainFilterPlugin.hxx"
#include "PlayerControl.hxx"
#include "MusicPipe.hxx"
#include "MusicChunk.hxx"

26
src/filter/replay_gain_filter_plugin.c → src/filter/ReplayGainFilterPlugin.cxx
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2003-2011 The Music Player Daemon Project
* Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@ -18,16 +18,19 @@
*/
#include "config.h"
#include "filter/replay_gain_filter_plugin.h"
#include "ReplayGainFilterPlugin.hxx"
#include "filter_plugin.h"
#include "filter_internal.h"
#include "filter_registry.h"
#include "audio_format.h"
#include "pcm_buffer.h"
#include "pcm_volume.h"
#include "replay_gain_info.h"
#include "replay_gain_config.h"
extern "C" {
#include "pcm_buffer.h"
#include "pcm_volume.h"
#include "mixer_control.h"
}
#include <assert.h>
#include <string.h>
@ -183,7 +186,8 @@ replay_gain_filter_filter(struct filter *_filter,
memcpy(dest, src, src_size);
success = pcm_volume(dest, src_size, filter->audio_format.format,
success = pcm_volume(dest, src_size,
sample_format(filter->audio_format.format),
filter->volume);
if (!success) {
g_set_error(error_r, replay_gain_quark(), 0,
@ -195,12 +199,12 @@ replay_gain_filter_filter(struct filter *_filter,
}
const struct filter_plugin replay_gain_filter_plugin = {
.name = "replay_gain",
.init = replay_gain_filter_init,
.finish = replay_gain_filter_finish,
.open = replay_gain_filter_open,
.close = replay_gain_filter_close,
.filter = replay_gain_filter_filter,
"replay_gain",
replay_gain_filter_init,
replay_gain_filter_finish,
replay_gain_filter_open,
replay_gain_filter_close,
replay_gain_filter_filter,
};
void

6
src/filter/replay_gain_filter_plugin.h → src/filter/ReplayGainFilterPlugin.hxx
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 2003-2011 The Music Player Daemon Project
* Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef REPLAY_GAIN_FILTER_PLUGIN_H
#define REPLAY_GAIN_FILTER_PLUGIN_H
#ifndef MPD_REPLAY_GAIN_FILTER_PLUGIN_HXX
#define MPD_REPLAY_GAIN_FILTER_PLUGIN_HXX
#include "replay_gain_info.h"