From 823c618d241e7e45f31981c437215bc35664c385 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 30 Jan 2013 19:39:08 +0100
Subject: {encoder,output}_api.h: allow compiling as C++

---
 src/OutputControl.cxx               | 2 +-
 src/OutputInit.cxx                  | 2 +-
 src/OutputThread.cxx                | 2 +-
 src/encoder/OpusEncoderPlugin.cxx   | 4 ----
 src/encoder/VorbisEncoderPlugin.cxx | 4 ----
 src/output_plugin.h                 | 8 ++++++++
 src/pcm_buffer.h                    | 8 ++++++++
 7 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/OutputControl.cxx b/src/OutputControl.cxx
index 13625ade2..8e7447bc5 100644
--- a/src/OutputControl.cxx
+++ b/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"
diff --git a/src/OutputInit.cxx b/src/OutputInit.cxx
index 4e352f287..dfb246a08 100644
--- a/src/OutputInit.cxx
+++ b/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"
diff --git a/src/OutputThread.cxx b/src/OutputThread.cxx
index 20212cef9..685475be3 100644
--- a/src/OutputThread.cxx
+++ b/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"
diff --git a/src/encoder/OpusEncoderPlugin.cxx b/src/encoder/OpusEncoderPlugin.cxx
index 53d16a8e4..8d2c0974b 100644
--- a/src/encoder/OpusEncoderPlugin.cxx
+++ b/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"
diff --git a/src/encoder/VorbisEncoderPlugin.cxx b/src/encoder/VorbisEncoderPlugin.cxx
index 74048e0cd..dc7ef0d5e 100644
--- a/src/encoder/VorbisEncoderPlugin.cxx
+++ b/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"
diff --git a/src/output_plugin.h b/src/output_plugin.h
index a47296566..2b71ba6a6 100644
--- a/src/output_plugin.h
+++ b/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
diff --git a/src/pcm_buffer.h b/src/pcm_buffer.h
index 4502976f6..5d6382d5e 100644
--- a/src/pcm_buffer.h
+++ b/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
-- 
cgit v1.2.3