diff options
Diffstat (limited to '')
29 files changed, 39 insertions, 49 deletions
diff --git a/src/decoder_api.h b/src/DecoderAPI.hxx index 3f84ca8bc..79d733649 100644 --- a/src/decoder_api.h +++ b/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 diff --git a/src/decoder_command.h b/src/DecoderCommand.hxx index 795e13fb2..e6dc26982 100644 --- a/src/decoder_command.h +++ b/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, diff --git a/src/decoder_error.h b/src/DecoderError.hxx index a12a31937..14810dec7 100644 --- a/src/decoder_error.h +++ b/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> diff --git a/src/decoder_plugin.h b/src/DecoderPlugin.hxx index b7ab738b5..271595b71 100644 --- a/src/decoder_plugin.h +++ b/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> diff --git a/src/decoder/AdPlugDecoderPlugin.cxx b/src/decoder/AdPlugDecoderPlugin.cxx index 6d08fab56..e752295f5 100644 --- a/src/decoder/AdPlugDecoderPlugin.cxx +++ b/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" diff --git a/src/decoder/AudiofileDecoderPlugin.cxx b/src/decoder/AudiofileDecoderPlugin.cxx index e42cfc66e..4eb5c14a6 100644 --- a/src/decoder/AudiofileDecoderPlugin.cxx +++ b/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" diff --git a/src/decoder/DsdLib.cxx b/src/decoder/DsdLib.cxx index dd7ea70c9..40a553d91 100644 --- a/src/decoder/DsdLib.cxx +++ b/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" diff --git a/src/decoder/DsdiffDecoderPlugin.cxx b/src/decoder/DsdiffDecoderPlugin.cxx index ed2a533b0..9934e4a37 100644 --- a/src/decoder/DsdiffDecoderPlugin.cxx +++ b/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" diff --git a/src/decoder/DsfDecoderPlugin.cxx b/src/decoder/DsfDecoderPlugin.cxx index a6f575d97..545f12975 100644 --- a/src/decoder/DsfDecoderPlugin.cxx +++ b/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" diff --git a/src/decoder/FaadDecoderPlugin.cxx b/src/decoder/FaadDecoderPlugin.cxx index 3e8a9b6bc..4636d08cb 100644 --- a/src/decoder/FaadDecoderPlugin.cxx +++ b/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" diff --git a/src/decoder/FfmpegDecoderPlugin.cxx b/src/decoder/FfmpegDecoderPlugin.cxx index fe657728a..8b9810233 100644 --- a/src/decoder/FfmpegDecoderPlugin.cxx +++ b/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" diff --git a/src/decoder/FlacCommon.hxx b/src/decoder/FlacCommon.hxx index 0cd295e0d..78982e308 100644 --- a/src/decoder/FlacCommon.hxx +++ b/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" diff --git a/src/decoder/FlacInput.cxx b/src/decoder/FlacInput.cxx index f5dedd97b..0bb5ec7d7 100644 --- a/src/decoder/FlacInput.cxx +++ b/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" diff --git a/src/decoder/FluidsynthDecoderPlugin.cxx b/src/decoder/FluidsynthDecoderPlugin.cxx index da1b41a58..5fbc83bdf 100644 --- a/src/decoder/FluidsynthDecoderPlugin.cxx +++ b/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" diff --git a/src/decoder/GmeDecoderPlugin.cxx b/src/decoder/GmeDecoderPlugin.cxx index 9693dd32b..108a589a1 100644 --- a/src/decoder/GmeDecoderPlugin.cxx +++ b/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" diff --git a/src/decoder/MadDecoderPlugin.cxx b/src/decoder/MadDecoderPlugin.cxx index a8b607386..bbfd2f412 100644 --- a/src/decoder/MadDecoderPlugin.cxx +++ b/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" { diff --git a/src/decoder/MikmodDecoderPlugin.cxx b/src/decoder/MikmodDecoderPlugin.cxx index 94dff0856..538dfd599 100644 --- a/src/decoder/MikmodDecoderPlugin.cxx +++ b/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" diff --git a/src/decoder/ModplugDecoderPlugin.cxx b/src/decoder/ModplugDecoderPlugin.cxx index 3c6dc0ca1..a08c96f97 100644 --- a/src/decoder/ModplugDecoderPlugin.cxx +++ b/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> diff --git a/src/decoder/MpcdecDecoderPlugin.cxx b/src/decoder/MpcdecDecoderPlugin.cxx index 36cf620c6..17130f1a8 100644 --- a/src/decoder/MpcdecDecoderPlugin.cxx +++ b/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" diff --git a/src/decoder/Mpg123DecoderPlugin.cxx b/src/decoder/Mpg123DecoderPlugin.cxx index f43aa5dea..ab21a9bac 100644 --- a/src/decoder/Mpg123DecoderPlugin.cxx +++ b/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" diff --git a/src/decoder/OggCodec.hxx b/src/decoder/OggCodec.hxx index e241560fb..eb709286b 100644 --- a/src/decoder/OggCodec.hxx +++ b/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, diff --git a/src/decoder/OggUtil.cxx b/src/decoder/OggUtil.cxx index a1125a2c6..0e2f48f51 100644 --- a/src/decoder/OggUtil.cxx +++ b/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, diff --git a/src/decoder/OpusDecoderPlugin.cxx b/src/decoder/OpusDecoderPlugin.cxx index 3e3a1e4e7..f1304a1b7 100644 --- a/src/decoder/OpusDecoderPlugin.cxx +++ b/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" diff --git a/src/decoder/PcmDecoderPlugin.cxx b/src/decoder/PcmDecoderPlugin.cxx index a1c965bbb..c86d0fa3b 100644 --- a/src/decoder/PcmDecoderPlugin.cxx +++ b/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" diff --git a/src/decoder/SndfileDecoderPlugin.cxx b/src/decoder/SndfileDecoderPlugin.cxx index d884ca2d1..0a40971a4 100644 --- a/src/decoder/SndfileDecoderPlugin.cxx +++ b/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" diff --git a/src/decoder/VorbisDecoderPlugin.cxx b/src/decoder/VorbisDecoderPlugin.cxx index 822714c4e..bc3c1edce 100644 --- a/src/decoder/VorbisDecoderPlugin.cxx +++ b/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" diff --git a/src/decoder/WavpackDecoderPlugin.cxx b/src/decoder/WavpackDecoderPlugin.cxx index bac62d429..6776f7193 100644 --- a/src/decoder/WavpackDecoderPlugin.cxx +++ b/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" { diff --git a/src/decoder/WildmidiDecoderPlugin.cxx b/src/decoder/WildmidiDecoderPlugin.cxx index 28602e38a..c6979132b 100644 --- a/src/decoder/WildmidiDecoderPlugin.cxx +++ b/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" diff --git a/src/decoder/sidplay_decoder_plugin.cxx b/src/decoder/sidplay_decoder_plugin.cxx index 175d2ee7c..eec9437d1 100644 --- a/src/decoder/sidplay_decoder_plugin.cxx +++ b/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" |