filter_config: convert to C++

4 files changed, 15 insertions, 16 deletions

diff --git a/Makefile.am b/Makefile.am
index 482e38921..2477e0fe1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,7 +56,6 @@ mpd_headers = \
 	src/output_internal.h \
 	src/output_api.h \
 	src/filter_internal.h \
-	src/filter_config.h \
 	src/filter_plugin.h \
 	src/filter_registry.h \
 	src/filter/autoconvert_filter_plugin.h \
@@ -172,7 +171,7 @@ src_mpd_SOURCES = \
 	src/DatabaseSelection.cxx src/DatabaseSelection.hxx \
 	src/ExcludeList.cxx src/ExcludeList.hxx \
 	src/fd_util.c \
-	src/filter_config.c \
+	src/FilterConfig.cxx src/FilterConfig.hxx \
 	src/filter_plugin.c \
 	src/filter_registry.c \
 	src/UpdateGlue.cxx src/UpdateGlue.hxx \
@@ -1332,7 +1331,7 @@ test_run_output_SOURCES = test/run_output.cxx \
 	src/mixer_control.c \
 	src/mixer_type.c \
 	src/filter_plugin.c \
-	src/filter_config.c \
+	src/FilterConfig.cxx \
 	src/AudioCompress/compress.c \
 	src/ReplayGainInfo.cxx \
 	src/fd_util.c
diff --git a/src/filter_config.c b/src/FilterConfig.cxx
index ab9bdb0c5..1b5cf96e9 100644
--- a/src/filter_config.c
+++ b/src/FilterConfig.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
@@ -17,17 +17,20 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "filter_config.h"
 #include "config.h"
+#include "FilterConfig.hxx"
 #include "conf.h"
+
+extern "C" {
 #include "filter/chain_filter_plugin.h"
+}
+
 #include "filter_plugin.h"
 #include "filter_internal.h"
 #include "filter_registry.h"
 
 #include <string.h>
 
-
 static GQuark
 filter_quark(void)
 {
@@ -83,7 +86,7 @@ filter_chain_parse(struct filter *chain, const char *spec, GError **error_r)
 	// Split on comma
 	gchar** tokens = g_strsplit_set(spec, ",", 255);
 
-	int added_filters = 0;
+	unsigned added_filters = 0;
 
 	// Add each name to the filter chain by instantiating an actual filter
 	char **template_names = tokens;
diff --git a/src/filter_config.h b/src/FilterConfig.hxx
index 920cbc07c..18cc5c44f 100644
--- a/src/filter_config.h
+++ b/src/FilterConfig.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
@@ -22,15 +22,12 @@
  * Utility functions for filter configuration
  */
 
-#ifndef MPD_FILTER_CONFIG_H
-#define MPD_FILTER_CONFIG_H
+#ifndef MPD_FILTER_CONFIG_HXX
+#define MPD_FILTER_CONFIG_HXX
 
-#include "conf.h"
-#include "filter/chain_filter_plugin.h"
-#include "filter_plugin.h"
-#include "filter_internal.h"
-#include "filter_registry.h"
+#include "gerror.h"
 
+struct filter;
 
 /**
  * Builds a filter chain from a configuration string on the form
diff --git a/src/OutputInit.cxx b/src/OutputInit.cxx
index 3c394ba44..2890b3f29 100644
--- a/src/OutputInit.cxx
+++ b/src/OutputInit.cxx
@@ -20,6 +20,7 @@
 #include "config.h"
 #include "OutputControl.hxx"
 #include "OutputList.hxx"
+#include "FilterConfig.hxx"
 
 extern "C" {
 #include "output_api.h"
@@ -31,7 +32,6 @@ extern "C" {
 #include "mixer/software_mixer_plugin.h"
 #include "filter_plugin.h"
 #include "filter_registry.h"
-#include "filter_config.h"
 #include "filter/chain_filter_plugin.h"
 #include "filter/autoconvert_filter_plugin.h"
 }