decoder_api: convert to C++

Makefile.am

@@ -58,10 +58,6 @@ mpd_headers = \
 	src/filter_internal.h \
 	src/command.h \
 	src/conf.h \
-	src/decoder_plugin.h \
-	src/decoder_command.h \
-	src/decoder_api.h \
-	src/decoder_plugin.h \
 	src/encoder_plugin.h \
 	src/encoder_api.h \
 	src/fd_util.h \
@@ -129,10 +125,12 @@ src_mpd_SOURCES = \
 	src/CommandLine.cxx src/CommandLine.hxx \
 	src/CrossFade.cxx src/CrossFade.hxx \
 	src/cue/CueParser.cxx src/cue/CueParser.hxx \
-	src/decoder_error.h \
+	src/DecoderError.hxx \
 	src/DecoderThread.cxx src/DecoderThread.hxx \
+	src/DecoderCommand.hxx \
 	src/DecoderControl.cxx src/DecoderControl.hxx \
-	src/DecoderAPI.cxx \
+	src/DecoderAPI.cxx src/DecoderAPI.hxx \
+	src/DecoderPlugin.hxx \
 	src/DecoderInternal.cxx src/DecoderInternal.hxx \
 	src/DecoderPrint.cxx src/DecoderPrint.hxx \
 	src/Directory.cxx src/Directory.hxx \

src/CommandLine.cxx

@@ -23,7 +23,7 @@
 #include "Log.hxx"
 #include "conf.h"
 #include "DecoderList.hxx"
-#include "decoder_plugin.h"
+#include "DecoderPlugin.hxx"
 #include "OutputList.hxx"
 #include "OutputPlugin.hxx"
 #include "InputRegistry.hxx"

src/DecoderAPI.cxx

@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "AudioConfig.hxx"
 #include "replay_gain_config.h"
 #include "MusicChunk.hxx"

src/DecoderAPI.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
@@ -24,24 +24,18 @@
  * communicate with the mpd core.
  */
 
-#ifndef MPD_DECODER_API_H
-#define MPD_DECODER_API_H
+#ifndef MPD_DECODER_API_HXX
+#define MPD_DECODER_API_HXX
 
 #include "check.h"
-#include "decoder_command.h"
-#include "decoder_plugin.h"
+#include "DecoderCommand.hxx"
+#include "DecoderPlugin.hxx"
 #include "input_stream.h"
 #include "replay_gain_info.h"
 #include "tag.h"
 #include "audio_format.h"
 #include "conf.h"
 
-#include <stdbool.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /**
  * Notify the player thread that it has finished initialization and
  * that it has read the song's meta data.
@@ -172,8 +166,4 @@ void
 decoder_mixramp(struct decoder *decoder,
 		char *mixramp_start, char *mixramp_end);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif

src/DecoderBuffer.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "DecoderBuffer.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 
 #include <glib.h>
 

src/DecoderCommand.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_DECODER_COMMAND_H
-#define MPD_DECODER_COMMAND_H
+#ifndef MPD_DECODER_COMMAND_HXX
+#define MPD_DECODER_COMMAND_HXX
 
 enum decoder_command {
 	DECODE_COMMAND_NONE = 0,

src/DecoderControl.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_DECODER_CONTROL_HXX
 #define MPD_DECODER_CONTROL_HXX
 
-#include "decoder_command.h"
+#include "DecoderCommand.hxx"
 #include "audio_format.h"
 #include "thread/Mutex.hxx"
 #include "thread/Cond.hxx"

src/DecoderError.hxx

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2012 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_DECODER_ERROR_H
-#define MPD_DECODER_ERROR_H
+#ifndef MPD_DECODER_ERROR_HXX
+#define MPD_DECODER_ERROR_HXX
 
 #include <glib.h>
 

src/DecoderInternal.hxx

@@ -20,7 +20,7 @@
 #ifndef MPD_DECODER_INTERNAL_HXX
 #define MPD_DECODER_INTERNAL_HXX
 
-#include "decoder_command.h"
+#include "DecoderCommand.hxx"
 #include "pcm/PcmConvert.hxx"
 #include "replay_gain_info.h"
 

src/DecoderList.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "DecoderList.hxx"
-#include "decoder_plugin.h"
+#include "DecoderPlugin.hxx"
 #include "conf.h"
 #include "mpd_error.h"
 #include "decoder/AudiofileDecoderPlugin.hxx"

src/DecoderPlugin.cxx

@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "decoder_plugin.h"
+#include "DecoderPlugin.hxx"
 #include "util/StringUtil.hxx"
 
 #include <assert.h>

src/DecoderPlugin.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_DECODER_PLUGIN_H
-#define MPD_DECODER_PLUGIN_H
+#ifndef MPD_DECODER_PLUGIN_HXX
+#define MPD_DECODER_PLUGIN_HXX
 
 #include <stdbool.h>
 #include <stddef.h>

src/DecoderPrint.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "DecoderPrint.hxx"
 #include "DecoderList.hxx"
-#include "decoder_plugin.h"
+#include "DecoderPlugin.hxx"
 #include "Client.hxx"
 
 #include <assert.h>

src/DecoderThread.cxx

@@ -21,13 +21,13 @@
 #include "DecoderThread.hxx"
 #include "DecoderControl.hxx"
 #include "DecoderInternal.hxx"
-#include "decoder_error.h"
-#include "decoder_plugin.h"
+#include "DecoderError.hxx"
+#include "DecoderPlugin.hxx"
 #include "song.h"
 #include "mpd_error.h"
 #include "Mapper.hxx"
 #include "fs/Path.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "tag.h"
 #include "InputStream.hxx"
 #include "DecoderList.hxx"

src/SongUpdate.cxx

@@ -30,7 +30,7 @@ extern "C" {
 #include "fs/FileSystem.hxx"
 #include "tag.h"
 #include "input_stream.h"
-#include "decoder_plugin.h"
+#include "DecoderPlugin.hxx"
 #include "DecoderList.hxx"
 
 extern "C" {

src/TagFile.cxx

@@ -21,7 +21,7 @@
 #include "TagFile.hxx"
 #include "util/UriUtil.hxx"
 #include "DecoderList.hxx"
-#include "decoder_plugin.h"
+#include "DecoderPlugin.hxx"
 #include "input_stream.h"
 
 #include <assert.h>

src/UpdateContainer.cxx

@@ -24,7 +24,7 @@
 #include "DatabaseLock.hxx"
 #include "Directory.hxx"
 #include "song.h"
-#include "decoder_plugin.h"
+#include "DecoderPlugin.hxx"
 #include "Mapper.hxx"
 #include "fs/Path.hxx"
 

src/UpdateSong.cxx

@@ -26,7 +26,7 @@
 #include "DatabaseLock.hxx"
 #include "Directory.hxx"
 #include "song.h"
-#include "decoder_plugin.h"
+#include "DecoderPlugin.hxx"
 #include "DecoderList.hxx"
 
 #include <glib.h>

src/decoder/AdPlugDecoderPlugin.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "AdPlugDecoderPlugin.h"
 #include "tag_handler.h"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 
 extern "C" {
 #include "audio_check.h"

src/decoder/AudiofileDecoderPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "AudiofileDecoderPlugin.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "audio_check.h"
 #include "tag_handler.h"
 

src/decoder/DsdLib.cxx

@@ -25,7 +25,7 @@
 
 #include "config.h"
 #include "DsdLib.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "util/bit_reverse.h"
 #include "tag_handler.h"
 

src/decoder/DsdiffDecoderPlugin.cxx

@@ -28,7 +28,7 @@
 
 #include "config.h"
 #include "DsdiffDecoderPlugin.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "audio_check.h"
 #include "util/bit_reverse.h"
 #include "tag_handler.h"

src/decoder/DsfDecoderPlugin.cxx

@@ -29,7 +29,7 @@
 
 #include "config.h"
 #include "DsfDecoderPlugin.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "audio_check.h"
 #include "util/bit_reverse.h"
 #include "DsdLib.hxx"

src/decoder/FaadDecoderPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "FaadDecoderPlugin.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "DecoderBuffer.hxx"
 #include "audio_check.h"
 #include "tag_handler.h"

src/decoder/FfmpegDecoderPlugin.cxx

@@ -22,7 +22,7 @@
 
 #include "config.h"
 #include "FfmpegDecoderPlugin.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "FfmpegMetaData.hxx"
 #include "tag_handler.h"
 #include "InputStream.hxx"

src/decoder/FlacCommon.hxx

@@ -25,7 +25,7 @@
 #define MPD_FLAC_COMMON_HXX
 
 #include "FlacInput.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 
 extern "C" {
 #include "pcm/pcm_buffer.h"

src/decoder/FlacInput.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "FlacInput.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "gcc.h"
 #include "InputStream.hxx"
 

src/decoder/FluidsynthDecoderPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "FluidsynthDecoderPlugin.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "audio_check.h"
 #include "conf.h"
 

src/decoder/GmeDecoderPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "GmeDecoderPlugin.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "audio_check.h"
 #include "tag_handler.h"
 #include "util/UriUtil.hxx"

src/decoder/MadDecoderPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "MadDecoderPlugin.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "conf.h"
 
 extern "C" {

src/decoder/MikmodDecoderPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "MikmodDecoderPlugin.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "mpd_error.h"
 #include "tag_handler.h"
 

src/decoder/ModplugDecoderPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "ModplugDecoderPlugin.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "tag_handler.h"
 
 #include <glib.h>

src/decoder/MpcdecDecoderPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "MpcdecDecoderPlugin.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "audio_check.h"
 #include "tag_handler.h"
 

src/decoder/Mpg123DecoderPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h" /* must be first for large file support */
 #include "Mpg123DecoderPlugin.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "audio_check.h"
 #include "tag_handler.h"
 

src/decoder/OggCodec.hxx

@@ -24,7 +24,7 @@
 #ifndef MPD_OGG_CODEC_HXX
 #define MPD_OGG_CODEC_HXX
 
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 
 enum ogg_codec {
 	OGG_CODEC_UNKNOWN,

src/decoder/OggUtil.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "OggUtil.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 
 bool
 OggFeed(ogg_sync_state &oy, struct decoder *decoder,

src/decoder/OpusDecoderPlugin.cxx

@@ -24,7 +24,7 @@
 #include "OggUtil.hxx"
 #include "OggFind.hxx"
 #include "OggSyncState.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "OggCodec.hxx"
 #include "audio_check.h"
 #include "tag_handler.h"

src/decoder/PcmDecoderPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "decoder/PcmDecoderPlugin.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 
 extern "C" {
 #include "util/byte_reverse.h"

src/decoder/SndfileDecoderPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "SndfileDecoderPlugin.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "audio_check.h"
 #include "tag_handler.h"
 

src/decoder/VorbisDecoderPlugin.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "VorbisDecoderPlugin.h"
 #include "VorbisComments.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "InputStream.hxx"
 #include "OggCodec.hxx"
 #include "util/UriUtil.hxx"

src/decoder/WavpackDecoderPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "WavpackDecoderPlugin.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "InputStream.hxx"
 
 extern "C" {

src/decoder/WildmidiDecoderPlugin.cxx

@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "WildmidiDecoderPlugin.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "tag_handler.h"
 #include "glib_compat.h"
 

src/decoder/sidplay_decoder_plugin.cxx

@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "../decoder_api.h"
+#include "../DecoderAPI.hxx"
 
 extern "C" {
 #include "tag_handler.h"

test/dump_playlist.cxx

@@ -23,7 +23,7 @@
 #include "Directory.hxx"
 #include "input_stream.h"
 #include "conf.h"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "DecoderList.hxx"
 #include "InputInit.hxx"
 #include "IOThread.hxx"

test/read_tags.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "IOThread.hxx"
 #include "DecoderList.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "InputInit.hxx"
 #include "InputStream.hxx"
 #include "audio_format.h"

test/run_decoder.cxx

@@ -20,7 +20,7 @@
 #include "config.h"
 #include "IOThread.hxx"
 #include "DecoderList.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
 #include "InputInit.hxx"
 #include "input_stream.h"
 #include "audio_format.h"