filter/replay_gain: convert to C++

6 files changed, 24 insertions, 19 deletions

diff --git a/Makefile.am b/Makefile.am
index 132dd6974..aa3234bf5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 = \
diff --git a/src/OutputControl.cxx b/src/OutputControl.cxx
index 7cc2814de..005003d2d 100644
--- a/src/OutputControl.cxx
+++ b/src/OutputControl.cxx
@@ -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>
diff --git a/src/OutputInit.cxx b/src/OutputInit.cxx
index 5fc800d19..3c394ba44 100644
--- a/src/OutputInit.cxx
+++ b/src/OutputInit.cxx
@@ -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>
diff --git a/src/OutputThread.cxx b/src/OutputThread.cxx
index 3d0d96f7a..6fe833330 100644
--- a/src/OutputThread.cxx
+++ b/src/OutputThread.cxx
@@ -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"
diff --git a/src/filter/replay_gain_filter_plugin.c b/src/filter/ReplayGainFilterPlugin.cxx
index 9fd3cbc07..1c2f40260 100644
--- a/src/filter/replay_gain_filter_plugin.c
+++ b/src/filter/ReplayGainFilterPlugin.cxx
@@ -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
diff --git a/src/filter/replay_gain_filter_plugin.h b/src/filter/ReplayGainFilterPlugin.hxx
index da2df9d6a..9b4ffc522 100644
--- a/src/filter/replay_gain_filter_plugin.h
+++ b/src/filter/ReplayGainFilterPlugin.hxx
@@ -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"