output_api: convert to C++

Makefile.am

@@ -52,7 +52,6 @@ mpd_headers = \
 	src/check.h \
 	src/ack.h \
 	src/audio_format.h \
-	src/output_api.h \
 	src/filter_internal.h \
 	src/command.h \
 	src/conf.h \
@@ -770,6 +769,7 @@ OUTPUT_LIBS = \
 	$(SHOUT_LIBS)
 
 OUTPUT_API_SRC = \
+	src/OutputAPI.hxx \
 	src/OutputInternal.hxx \
 	src/OutputList.cxx src/OutputList.hxx \
 	src/OutputAll.cxx src/OutputAll.hxx \

src/output_api.h → src/OutputAPI.hxx

 /*
- * 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_API_H
-#define MPD_OUTPUT_API_H
+#ifndef MPD_OUTPUT_API_HXX
+#define MPD_OUTPUT_API_HxX
 
 #include "OutputPlugin.hxx"
 #include "OutputInternal.hxx"

src/OutputInit.cxx

@@ -22,8 +22,8 @@
 #include "OutputControl.hxx"
 #include "OutputList.hxx"
 #include "OutputError.hxx"
+#include "OutputAPI.hxx"
 #include "FilterConfig.hxx"
-#include "output_api.h"
 #include "AudioParser.hxx"
 #include "MixerList.hxx"
 #include "MixerType.hxx"

src/OutputList.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "OutputList.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 #include "output/AlsaOutputPlugin.hxx"
 #include "output/AoOutputPlugin.hxx"
 #include "output/FifoOutputPlugin.hxx"

src/OutputThread.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "OutputThread.hxx"
 #include "OutputInternal.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 #include "pcm/PcmMix.hxx"
 #include "notify.hxx"
 #include "FilterInternal.hxx"

src/mixer/AlsaMixerPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "MixerInternal.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 #include "GlobalEvents.hxx"
 #include "Main.hxx"
 #include "event/MultiSocketMonitor.hxx"

src/mixer/OssMixerPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "MixerInternal.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 #include "fd_util.h"
 
 #include <glib.h>

src/mixer/RoarMixerPlugin.cxx

@@ -21,7 +21,7 @@
 
 #include "config.h"
 #include "MixerInternal.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 #include "output/RoarOutputPlugin.hxx"
 
 struct RoarMixer final : public Mixer {

src/mixer/WinmmMixerPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "MixerInternal.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 #include "output/WinmmOutputPlugin.hxx"
 
 #include <mmsystem.h>

src/output/AlsaOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "AlsaOutputPlugin.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 #include "MixerList.hxx"
 #include "pcm/PcmExport.hxx"
 #include "util/Manual.hxx"

src/output/AoOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "AoOutputPlugin.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 
 #include <ao/ao.h>
 #include <glib.h>

src/output/FifoOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "FifoOutputPlugin.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 #include "Timer.hxx"
 #include "fd_util.h"
 #include "open.h"

src/output/HttpdOutputPlugin.cxx

@@ -21,7 +21,7 @@
 #include "HttpdOutputPlugin.hxx"
 #include "HttpdInternal.hxx"
 #include "HttpdClient.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 #include "encoder_plugin.h"
 #include "EncoderList.hxx"
 #include "resolver.h"

src/output/JackOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "JackOutputPlugin.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 
 #include <assert.h>
 

src/output/NullOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "NullOutputPlugin.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 #include "Timer.hxx"
 
 #include <assert.h>

src/output/OSXOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "OSXOutputPlugin.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 #include "util/fifo_buffer.h"
 #include "thread/Mutex.hxx"
 #include "thread/Cond.hxx"

src/output/OpenALOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "OpenALOutputPlugin.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 
 #include <glib.h>
 

src/output/OssOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "OssOutputPlugin.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 #include "MixerList.hxx"
 #include "fd_util.h"
 

src/output/PipeOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "PipeOutputPlugin.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 
 #include <stdio.h>
 #include <errno.h>

src/output/PulseOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "PulseOutputPlugin.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 #include "MixerList.hxx"
 #include "mixer/PulseMixerPlugin.hxx"
 

src/output/RecorderOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "RecorderOutputPlugin.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 #include "encoder_plugin.h"
 #include "EncoderList.hxx"
 #include "fd_util.h"

src/output/RoarOutputPlugin.cxx

@@ -20,7 +20,7 @@
 
 #include "config.h"
 #include "RoarOutputPlugin.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 #include "MixerList.hxx"
 #include "thread/Mutex.hxx"
 

src/output/ShoutOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "ShoutOutputPlugin.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 #include "encoder_plugin.h"
 #include "EncoderList.hxx"
 #include "mpd_error.h"

src/output/SolarisOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "SolarisOutputPlugin.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 #include "fd_util.h"
 
 #include <glib.h>

src/output/WinmmOutputPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "WinmmOutputPlugin.hxx"
-#include "output_api.h"
+#include "OutputAPI.hxx"
 #include "pcm/pcm_buffer.h"
 #include "MixerList.hxx"