{encoder,output}_api.h: allow compiling as C++

src/OutputControl.cxx

@@ -20,9 +20,9 @@
 #include "config.h"
 #include "OutputControl.hxx"
 #include "OutputThread.hxx"
+#include "output_api.h"
 
 extern "C" {
-#include "output_api.h"
 #include "output_internal.h"
 #include "mixer_control.h"
 #include "mixer_plugin.h"

src/OutputInit.cxx

@@ -21,9 +21,9 @@
 #include "OutputControl.hxx"
 #include "OutputList.hxx"
 #include "FilterConfig.hxx"
+#include "output_api.h"
 
 extern "C" {
-#include "output_api.h"
 #include "output_internal.h"
 #include "audio_parser.h"
 #include "mixer_control.h"

src/OutputThread.cxx

@@ -19,9 +19,9 @@
 
 #include "config.h"
 #include "OutputThread.hxx"
+#include "output_api.h"
 
 extern "C" {
-#include "output_api.h"
 #include "output_internal.h"
 #include "pcm_mix.h"
 #include "filter_plugin.h"

src/encoder/OpusEncoderPlugin.cxx

@@ -20,11 +20,7 @@
 #include "config.h"
 #include "OpusEncoderPlugin.hxx"
 #include "OggStream.hxx"
-
-extern "C" {
 #include "encoder_api.h"
-}
-
 #include "encoder_plugin.h"
 #include "audio_format.h"
 #include "mpd_error.h"

src/encoder/VorbisEncoderPlugin.cxx

@@ -20,11 +20,7 @@
 #include "config.h"
 #include "VorbisEncoderPlugin.hxx"
 #include "OggStream.hxx"
-
-extern "C" {
 #include "encoder_api.h"
-}
-
 #include "encoder_plugin.h"
 #include "tag.h"
 #include "audio_format.h"

src/output_plugin.h

@@ -166,6 +166,10 @@ 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,
@@ -208,4 +212,8 @@ ao_plugin_cancel(struct audio_output *ao);
 bool
 ao_plugin_pause(struct audio_output *ao);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

src/pcm_buffer.h

@@ -62,6 +62,10 @@ pcm_buffer_deinit(struct pcm_buffer *buffer)
 	buffer->buffer = NULL;
 }
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Get the buffer, and guarantee a minimum size.  This buffer becomes
  * invalid with the next pcm_buffer_get() call.
@@ -74,4 +78,8 @@ G_GNUC_MALLOC
 void *
 pcm_buffer_get(struct pcm_buffer *buffer, size_t size);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif