aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Makefile.am10
-rw-r--r--src/CommandLine.cxx2
-rw-r--r--src/DecoderAPI.cxx2
-rw-r--r--src/DecoderAPI.hxx (renamed from src/decoder_api.h)20
-rw-r--r--src/DecoderBuffer.cxx2
-rw-r--r--src/DecoderCommand.hxx (renamed from src/decoder_command.h)6
-rw-r--r--src/DecoderControl.hxx2
-rw-r--r--src/DecoderError.hxx (renamed from src/decoder_error.h)6
-rw-r--r--src/DecoderInternal.hxx2
-rw-r--r--src/DecoderList.cxx2
-rw-r--r--src/DecoderPlugin.cxx2
-rw-r--r--src/DecoderPlugin.hxx (renamed from src/decoder_plugin.h)6
-rw-r--r--src/DecoderPrint.cxx2
-rw-r--r--src/DecoderThread.cxx6
-rw-r--r--src/SongUpdate.cxx2
-rw-r--r--src/TagFile.cxx2
-rw-r--r--src/UpdateContainer.cxx2
-rw-r--r--src/UpdateSong.cxx2
-rw-r--r--src/decoder/AdPlugDecoderPlugin.cxx2
-rw-r--r--src/decoder/AudiofileDecoderPlugin.cxx2
-rw-r--r--src/decoder/DsdLib.cxx2
-rw-r--r--src/decoder/DsdiffDecoderPlugin.cxx2
-rw-r--r--src/decoder/DsfDecoderPlugin.cxx2
-rw-r--r--src/decoder/FaadDecoderPlugin.cxx2
-rw-r--r--src/decoder/FfmpegDecoderPlugin.cxx2
-rw-r--r--src/decoder/FlacCommon.hxx2
-rw-r--r--src/decoder/FlacInput.cxx2
-rw-r--r--src/decoder/FluidsynthDecoderPlugin.cxx2
-rw-r--r--src/decoder/GmeDecoderPlugin.cxx2
-rw-r--r--src/decoder/MadDecoderPlugin.cxx2
-rw-r--r--src/decoder/MikmodDecoderPlugin.cxx2
-rw-r--r--src/decoder/ModplugDecoderPlugin.cxx2
-rw-r--r--src/decoder/MpcdecDecoderPlugin.cxx2
-rw-r--r--src/decoder/Mpg123DecoderPlugin.cxx2
-rw-r--r--src/decoder/OggCodec.hxx2
-rw-r--r--src/decoder/OggUtil.cxx2
-rw-r--r--src/decoder/OpusDecoderPlugin.cxx2
-rw-r--r--src/decoder/PcmDecoderPlugin.cxx2
-rw-r--r--src/decoder/SndfileDecoderPlugin.cxx2
-rw-r--r--src/decoder/VorbisDecoderPlugin.cxx2
-rw-r--r--src/decoder/WavpackDecoderPlugin.cxx2
-rw-r--r--src/decoder/WildmidiDecoderPlugin.cxx2
-rw-r--r--src/decoder/sidplay_decoder_plugin.cxx2
-rw-r--r--test/dump_playlist.cxx2
-rw-r--r--test/read_tags.cxx2
-rw-r--r--test/run_decoder.cxx2
46 files changed, 61 insertions, 73 deletions
diff --git a/Makefile.am b/Makefile.am
index c16d56aec..442e64609 100644
--- a/Makefile.am
+++ b/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 \
diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx
index d1f386f82..194bf3e2b 100644
--- a/src/CommandLine.cxx
+++ b/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"
diff --git a/src/DecoderAPI.cxx b/src/DecoderAPI.cxx
index d86b93fb4..bfadcfd8a 100644
--- a/src/DecoderAPI.cxx
+++ b/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"
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/DecoderBuffer.cxx b/src/DecoderBuffer.cxx
index 8e7da859b..0cc20450f 100644
--- a/src/DecoderBuffer.cxx
+++ b/src/DecoderBuffer.cxx
@@ -19,7 +19,7 @@
#include "config.h"
#include "DecoderBuffer.hxx"
-#include "decoder_api.h"
+#include "DecoderAPI.hxx"
#include <glib.h>
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/DecoderControl.hxx b/src/DecoderControl.hxx
index c2d7b33aa..09bf1b834 100644
--- a/src/DecoderControl.hxx
+++ b/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"
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/DecoderInternal.hxx b/src/DecoderInternal.hxx
index 4cc8d3aa7..02ead763b 100644
--- a/src/DecoderInternal.hxx
+++ b/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"
diff --git a/src/DecoderList.cxx b/src/DecoderList.cxx
index a66a21e2f..0827586db 100644
--- a/src/DecoderList.cxx
+++ b/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"
diff --git a/src/DecoderPlugin.cxx b/src/DecoderPlugin.cxx
index bcee3ac66..9dce4b21f 100644
--- a/src/DecoderPlugin.cxx
+++ b/src/DecoderPlugin.cxx
@@ -18,7 +18,7 @@
*/
#include "config.h"
-#include "decoder_plugin.h"
+#include "DecoderPlugin.hxx"
#include "util/StringUtil.hxx"
#include <assert.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/DecoderPrint.cxx b/src/DecoderPrint.cxx
index 719a499ec..3f7f94937 100644
--- a/src/DecoderPrint.cxx
+++ b/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>
diff --git a/src/DecoderThread.cxx b/src/DecoderThread.cxx
index fdc900abd..269dbdc1a 100644
--- a/src/DecoderThread.cxx
+++ b/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"
diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx
index dde2ad57a..a7666b47d 100644
--- a/src/SongUpdate.cxx
+++ b/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" {
diff --git a/src/TagFile.cxx b/src/TagFile.cxx
index 3cc4c0f54..9201dd85b 100644
--- a/src/TagFile.cxx
+++ b/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>
diff --git a/src/UpdateContainer.cxx b/src/UpdateContainer.cxx
index 27ee89bae..f090cf0f1 100644
--- a/src/UpdateContainer.cxx
+++ b/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"
diff --git a/src/UpdateSong.cxx b/src/UpdateSong.cxx
index 676ba48e2..0c2f2fb54 100644
--- a/src/UpdateSong.cxx
+++ b/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>
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"
diff --git a/test/dump_playlist.cxx b/test/dump_playlist.cxx
index c1205d2a3..74486cd98 100644
--- a/test/dump_playlist.cxx
+++ b/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"
diff --git a/test/read_tags.cxx b/test/read_tags.cxx
index 4c0b1c92d..4b208faed 100644
--- a/test/read_tags.cxx
+++ b/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"
diff --git a/test/run_decoder.cxx b/test/run_decoder.cxx
index d841a54d6..f30914fc5 100644
--- a/test/run_decoder.cxx
+++ b/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"