output: convert to C++

17 files changed, 28 insertions, 87 deletions

diff --git a/Makefile.am b/Makefile.am
index 7429ea8fa..766506f94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,7 +54,6 @@ mpd_headers = \
 	src/ape.h \
 	src/audio_format.h \
 	src/audio_check.h \
-	src/output_internal.h \
 	src/output_api.h \
 	src/filter_internal.h \
 	src/command.h \
@@ -768,6 +767,7 @@ OUTPUT_LIBS = \
 	$(SHOUT_LIBS)
 
 OUTPUT_API_SRC = \
+	src/OutputInternal.hxx \
 	src/OutputList.cxx src/OutputList.hxx \
 	src/OutputAll.cxx src/OutputAll.hxx \
 	src/OutputThread.cxx src/OutputThread.hxx \
@@ -776,7 +776,7 @@ OUTPUT_API_SRC = \
 	src/OutputState.cxx src/OutputState.hxx \
 	src/OutputPrint.cxx src/OutputPrint.hxx \
 	src/OutputCommand.cxx src/OutputCommand.hxx \
-	src/OutputPlugin.cxx src/output_plugin.h \
+	src/OutputPlugin.cxx src/OutputPlugin.hxx \
 	src/OutputFinish.cxx \
 	src/OutputInit.cxx
 
diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx
index 0de211fd7..ec6d8c7b1 100644
--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -25,7 +25,7 @@
 #include "DecoderList.hxx"
 #include "decoder_plugin.h"
 #include "OutputList.hxx"
-#include "output_plugin.h"
+#include "OutputPlugin.hxx"
 #include "InputRegistry.hxx"
 #include "InputPlugin.hxx"
 #include "PlaylistRegistry.hxx"
diff --git a/src/MixerAll.cxx b/src/MixerAll.cxx
index 3069f60d7..5a6235de4 100644
--- a/src/MixerAll.cxx
+++ b/src/MixerAll.cxx
@@ -24,10 +24,7 @@
 #include "MixerList.hxx"
 #include "OutputAll.hxx"
 #include "pcm/PcmVolume.hxx"
-
-extern "C" {
-#include "output_internal.h"
-}
+#include "OutputInternal.hxx"
 
 #include <glib.h>
 
diff --git a/src/OutputAll.cxx b/src/OutputAll.cxx
index 4cdcc84e7..c125a9730 100644
--- a/src/OutputAll.cxx
+++ b/src/OutputAll.cxx
@@ -19,12 +19,8 @@
 
 #include "config.h"
 #include "OutputAll.hxx"
-
-extern "C" {
-#include "output_internal.h"
-}
-
 #include "PlayerControl.hxx"
+#include "OutputInternal.hxx"
 #include "OutputControl.hxx"
 #include "OutputError.hxx"
 #include "MusicBuffer.hxx"
diff --git a/src/OutputCommand.cxx b/src/OutputCommand.cxx
index 3921a9634..bf051babf 100644
--- a/src/OutputCommand.cxx
+++ b/src/OutputCommand.cxx
@@ -27,15 +27,12 @@
 #include "config.h"
 #include "OutputCommand.hxx"
 #include "OutputAll.hxx"
+#include "OutputInternal.hxx"
+#include "OutputPlugin.hxx"
 #include "PlayerControl.hxx"
 #include "MixerControl.hxx"
 #include "Idle.hxx"
 
-extern "C" {
-#include "output_internal.h"
-#include "output_plugin.h"
-}
-
 extern unsigned audio_output_state_version;
 
 bool
diff --git a/src/OutputControl.cxx b/src/OutputControl.cxx
index c451938f7..3fe4b1e79 100644
--- a/src/OutputControl.cxx
+++ b/src/OutputControl.cxx
@@ -20,12 +20,8 @@
 #include "config.h"
 #include "OutputControl.hxx"
 #include "OutputThread.hxx"
-#include "output_api.h"
-
-extern "C" {
-#include "output_internal.h"
-}
-
+#include "OutputInternal.hxx"
+#include "OutputPlugin.hxx"
 #include "MixerPlugin.hxx"
 #include "MixerControl.hxx"
 #include "notify.hxx"
diff --git a/src/OutputFinish.cxx b/src/OutputFinish.cxx
index 559a5cf25..a64c02d58 100644
--- a/src/OutputFinish.cxx
+++ b/src/OutputFinish.cxx
@@ -18,12 +18,8 @@
  */
 
 #include "config.h"
-
-extern "C" {
-#include "output_internal.h"
-#include "output_plugin.h"
-}
-
+#include "OutputInternal.hxx"
+#include "OutputPlugin.hxx"
 #include "MixerControl.hxx"
 #include "FilterInternal.hxx"
 
diff --git a/src/OutputInit.cxx b/src/OutputInit.cxx
index c3a71c129..793f68dc2 100644
--- a/src/OutputInit.cxx
+++ b/src/OutputInit.cxx
@@ -18,17 +18,13 @@
  */
 
 #include "config.h"
+#include "OutputInternal.hxx"
 #include "OutputControl.hxx"
 #include "OutputList.hxx"
 #include "OutputError.hxx"
 #include "FilterConfig.hxx"
 #include "output_api.h"
 #include "AudioParser.hxx"
-
-extern "C" {
-#include "output_internal.h"
-}
-
 #include "MixerList.hxx"
 #include "MixerType.hxx"
 #include "MixerControl.hxx"
diff --git a/src/output_internal.h b/src/OutputInternal.hxx
index ed4188af0..dd7e5bc1d 100644
--- a/src/output_internal.h
+++ b/src/OutputInternal.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 MPD_OUTPUT_INTERNAL_H
-#define MPD_OUTPUT_INTERNAL_H
+#ifndef MPD_OUTPUT_INTERNAL_HXX
+#define MPD_OUTPUT_INTERNAL_HXX
 
 #include "audio_format.h"
 #include "pcm/pcm_buffer.h"
@@ -27,12 +27,7 @@
 
 #include <time.h>
 
-#ifdef __cplusplus
 class Filter;
-#else
-typedef void *Filter;
-#endif
-
 struct config_param;
 
 enum audio_output_command {
@@ -76,11 +71,7 @@ struct audio_output {
 	 * May be NULL if none is available, or if software volume is
 	 * configured.
 	 */
-#ifdef __cplusplus
 	class Mixer *mixer;
-#else
-	struct mixer *mixer;
-#endif
 
 	/**
 	 * Will this output receive tags from the decoder?  The
@@ -267,10 +258,6 @@ audio_output_command_is_finished(const struct audio_output *ao)
 	return ao->command == AO_COMMAND_NONE;
 }
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct audio_output *
 audio_output_new(const struct config_param *param,
 		 struct player_control *pc,
@@ -287,8 +274,4 @@ ao_base_finish(struct audio_output *ao);
 void
 audio_output_free(struct audio_output *ao);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/src/OutputPlugin.cxx b/src/OutputPlugin.cxx
index 9aa0f7792..8482a1d4f 100644
--- a/src/OutputPlugin.cxx
+++ b/src/OutputPlugin.cxx
@@ -18,12 +18,8 @@
  */
 
 #include "config.h"
-
-extern "C" {
-#include "output_plugin.h"
-}
-
-#include "output_internal.h"
+#include "OutputPlugin.hxx"
+#include "OutputInternal.hxx"
 
 struct audio_output *
 ao_plugin_init(const struct audio_output_plugin *plugin,
diff --git a/src/output_plugin.h b/src/OutputPlugin.hxx
index 2b71ba6a6..3839cd5b3 100644
--- a/src/output_plugin.h
+++ b/src/OutputPlugin.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 MPD_OUTPUT_PLUGIN_H
-#define MPD_OUTPUT_PLUGIN_H
+#ifndef MPD_OUTPUT_PLUGIN_HXX
+#define MPD_OUTPUT_PLUGIN_HXX
 
 #include "gcc.h"
 #include "gerror.h"
@@ -166,10 +166,6 @@ ao_plugin_test_default_device(const struct audio_output_plugin *plugin)
 		: false;
 }
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 gcc_malloc
 struct audio_output *
 ao_plugin_init(const struct audio_output_plugin *plugin,
@@ -212,8 +208,4 @@ ao_plugin_cancel(struct audio_output *ao);
 bool
 ao_plugin_pause(struct audio_output *ao);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif
diff --git a/src/OutputPrint.cxx b/src/OutputPrint.cxx
index 240ea967b..4e1cf9ced 100644
--- a/src/OutputPrint.cxx
+++ b/src/OutputPrint.cxx
@@ -25,7 +25,7 @@
 #include "config.h"
 #include "OutputPrint.hxx"
 #include "OutputAll.hxx"
-#include "output_internal.h"
+#include "OutputInternal.hxx"
 #include "Client.hxx"
 
 void
diff --git a/src/OutputState.cxx b/src/OutputState.cxx
index 27fa34f8f..776cac8f4 100644
--- a/src/OutputState.cxx
+++ b/src/OutputState.cxx
@@ -25,7 +25,7 @@
 #include "config.h"
 #include "OutputState.hxx"
 #include "OutputAll.hxx"
-#include "output_internal.h"
+#include "OutputInternal.hxx"
 
 #include <glib.h>
 
diff --git a/src/OutputThread.cxx b/src/OutputThread.cxx
index 34b3f50ba..7f2732fd8 100644
--- a/src/OutputThread.cxx
+++ b/src/OutputThread.cxx
@@ -19,13 +19,9 @@
 
 #include "config.h"
 #include "OutputThread.hxx"
+#include "OutputInternal.hxx"
 #include "output_api.h"
 #include "pcm/PcmMix.hxx"
-
-extern "C" {
-#include "output_internal.h"
-}
-
 #include "notify.hxx"
 #include "FilterInternal.hxx"
 #include "filter/ConvertFilterPlugin.hxx"
diff --git a/src/output/HttpdInternal.hxx b/src/output/HttpdInternal.hxx
index 4b526bcde..e79b9a224 100644
--- a/src/output/HttpdInternal.hxx
+++ b/src/output/HttpdInternal.hxx
@@ -25,7 +25,7 @@
 #ifndef MPD_OUTPUT_HTTPD_INTERNAL_H
 #define MPD_OUTPUT_HTTPD_INTERNAL_H
 
-#include "output_internal.h"
+#include "OutputInternal.hxx"
 #include "timer.h"
 #include "thread/Mutex.hxx"
 #include "event/ServerSocket.hxx"
diff --git a/src/output_api.h b/src/output_api.h
index dfeef3518..dee72d8db 100644
--- a/src/output_api.h
+++ b/src/output_api.h
@@ -20,8 +20,8 @@
 #ifndef MPD_OUTPUT_API_H
 #define MPD_OUTPUT_API_H
 
-#include "output_plugin.h"
-#include "output_internal.h"
+#include "OutputPlugin.hxx"
+#include "OutputInternal.hxx"
 #include "audio_format.h"
 #include "tag.h"
 #include "conf.h"
diff --git a/test/run_output.cxx b/test/run_output.cxx
index e41fe1cad..8c5007a9e 100644
--- a/test/run_output.cxx
+++ b/test/run_output.cxx
@@ -19,6 +19,8 @@
 
 #include "config.h"
 #include "OutputControl.hxx"
+#include "OutputInternal.hxx"
+#include "OutputPlugin.hxx"
 #include "conf.h"
 #include "Idle.hxx"
 #include "Main.hxx"
@@ -28,12 +30,6 @@
 #include "fs/Path.hxx"
 #include "AudioParser.hxx"
 #include "pcm/PcmConvert.hxx"
-
-extern "C" {
-#include "output_plugin.h"
-#include "output_internal.h"
-}
-
 #include "FilterRegistry.hxx"
 #include "PlayerControl.hxx"
 #include "stdbin.h"