decoder_plugin: rename struct to DecoderPlugin

42 files changed, 46 insertions, 46 deletions

diff --git a/src/decoder/AdPlugDecoderPlugin.cxx b/src/decoder/AdPlugDecoderPlugin.cxx
index 39dbf118b..bf9cb71e4 100644
--- a/src/decoder/AdPlugDecoderPlugin.cxx
+++ b/src/decoder/AdPlugDecoderPlugin.cxx
@@ -127,7 +127,7 @@ static const char *const adplug_suffixes[] = {
 	nullptr
 };
 
-const struct decoder_plugin adplug_decoder_plugin = {
+const struct DecoderPlugin adplug_decoder_plugin = {
 	"adplug",
 	adplug_init,
 	nullptr,
diff --git a/src/decoder/AdPlugDecoderPlugin.h b/src/decoder/AdPlugDecoderPlugin.h
index 9fdf438aa..a827fdc7d 100644
--- a/src/decoder/AdPlugDecoderPlugin.h
+++ b/src/decoder/AdPlugDecoderPlugin.h
@@ -20,6 +20,6 @@
 #ifndef MPD_DECODER_ADPLUG_H
 #define MPD_DECODER_ADPLUG_H
 
-extern const struct decoder_plugin adplug_decoder_plugin;
+extern const struct DecoderPlugin adplug_decoder_plugin;
 
 #endif
diff --git a/src/decoder/AudiofileDecoderPlugin.cxx b/src/decoder/AudiofileDecoderPlugin.cxx
index c7b1b1016..65fb14c0f 100644
--- a/src/decoder/AudiofileDecoderPlugin.cxx
+++ b/src/decoder/AudiofileDecoderPlugin.cxx
@@ -253,7 +253,7 @@ static const char *const audiofile_mime_types[] = {
 	nullptr
 };
 
-const struct decoder_plugin audiofile_decoder_plugin = {
+const struct DecoderPlugin audiofile_decoder_plugin = {
 	"audiofile",
 	nullptr,
 	nullptr,
diff --git a/src/decoder/AudiofileDecoderPlugin.hxx b/src/decoder/AudiofileDecoderPlugin.hxx
index 59c09c006..5a17281b0 100644
--- a/src/decoder/AudiofileDecoderPlugin.hxx
+++ b/src/decoder/AudiofileDecoderPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_DECODER_AUDIOFILE_HXX
 #define MPD_DECODER_AUDIOFILE_HXX
 
-extern const struct decoder_plugin audiofile_decoder_plugin;
+extern const struct DecoderPlugin audiofile_decoder_plugin;
 
 #endif
diff --git a/src/decoder/DsdiffDecoderPlugin.cxx b/src/decoder/DsdiffDecoderPlugin.cxx
index 95d4c4844..f5598826b 100644
--- a/src/decoder/DsdiffDecoderPlugin.cxx
+++ b/src/decoder/DsdiffDecoderPlugin.cxx
@@ -514,7 +514,7 @@ static const char *const dsdiff_mime_types[] = {
 	nullptr
 };
 
-const struct decoder_plugin dsdiff_decoder_plugin = {
+const struct DecoderPlugin dsdiff_decoder_plugin = {
 	"dsdiff",
 	dsdiff_init,
 	nullptr,
diff --git a/src/decoder/DsdiffDecoderPlugin.hxx b/src/decoder/DsdiffDecoderPlugin.hxx
index c50605457..be14fc9cd 100644
--- a/src/decoder/DsdiffDecoderPlugin.hxx
+++ b/src/decoder/DsdiffDecoderPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_DECODER_DSDIFF_H
 #define MPD_DECODER_DSDIFF_H
 
-extern const struct decoder_plugin dsdiff_decoder_plugin;
+extern const struct DecoderPlugin dsdiff_decoder_plugin;
 
 #endif
diff --git a/src/decoder/DsfDecoderPlugin.cxx b/src/decoder/DsfDecoderPlugin.cxx
index 95735d8c6..8aa24a1f9 100644
--- a/src/decoder/DsfDecoderPlugin.cxx
+++ b/src/decoder/DsfDecoderPlugin.cxx
@@ -345,7 +345,7 @@ static const char *const dsf_mime_types[] = {
 	NULL
 };
 
-const struct decoder_plugin dsf_decoder_plugin = {
+const struct DecoderPlugin dsf_decoder_plugin = {
 	"dsf",
 	nullptr,
 	nullptr,
diff --git a/src/decoder/DsfDecoderPlugin.hxx b/src/decoder/DsfDecoderPlugin.hxx
index 749032d1f..921c94698 100644
--- a/src/decoder/DsfDecoderPlugin.hxx
+++ b/src/decoder/DsfDecoderPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_DECODER_DSF_H
 #define MPD_DECODER_DSF_H
 
-extern const struct decoder_plugin dsf_decoder_plugin;
+extern const struct DecoderPlugin dsf_decoder_plugin;
 
 #endif
diff --git a/src/decoder/FaadDecoderPlugin.cxx b/src/decoder/FaadDecoderPlugin.cxx
index 077b3ccf2..4056c73fa 100644
--- a/src/decoder/FaadDecoderPlugin.cxx
+++ b/src/decoder/FaadDecoderPlugin.cxx
@@ -481,7 +481,7 @@ static const char *const faad_mime_types[] = {
 	"audio/aac", "audio/aacp", nullptr
 };
 
-const struct decoder_plugin faad_decoder_plugin = {
+const struct DecoderPlugin faad_decoder_plugin = {
 	"faad",
 	nullptr,
 	nullptr,
diff --git a/src/decoder/FaadDecoderPlugin.hxx b/src/decoder/FaadDecoderPlugin.hxx
index 162c155ad..817927d5e 100644
--- a/src/decoder/FaadDecoderPlugin.hxx
+++ b/src/decoder/FaadDecoderPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_FAAD_DECODER_PLUGIN_HXX
 #define MPD_FAAD_DECODER_PLUGIN_HXX
 
-extern const struct decoder_plugin faad_decoder_plugin;
+extern const struct DecoderPlugin faad_decoder_plugin;
 
 #endif
diff --git a/src/decoder/FfmpegDecoderPlugin.cxx b/src/decoder/FfmpegDecoderPlugin.cxx
index a93b5cc70..f7743180b 100644
--- a/src/decoder/FfmpegDecoderPlugin.cxx
+++ b/src/decoder/FfmpegDecoderPlugin.cxx
@@ -667,7 +667,7 @@ static const char *const ffmpeg_mime_types[] = {
 	nullptr
 };
 
-const struct decoder_plugin ffmpeg_decoder_plugin = {
+const struct DecoderPlugin ffmpeg_decoder_plugin = {
 	"ffmpeg",
 	ffmpeg_init,
 	nullptr,
diff --git a/src/decoder/FfmpegDecoderPlugin.hxx b/src/decoder/FfmpegDecoderPlugin.hxx
index 9a637fff0..23bf74fce 100644
--- a/src/decoder/FfmpegDecoderPlugin.hxx
+++ b/src/decoder/FfmpegDecoderPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_DECODER_FFMPEG_HXX
 #define MPD_DECODER_FFMPEG_HXX
 
-extern const struct decoder_plugin ffmpeg_decoder_plugin;
+extern const struct DecoderPlugin ffmpeg_decoder_plugin;
 
 #endif
diff --git a/src/decoder/FlacDecoderPlugin.cxx b/src/decoder/FlacDecoderPlugin.cxx
index 7ce44febd..ff67727b7 100644
--- a/src/decoder/FlacDecoderPlugin.cxx
+++ b/src/decoder/FlacDecoderPlugin.cxx
@@ -355,7 +355,7 @@ static const char *const oggflac_mime_types[] = {
 	nullptr
 };
 
-const struct decoder_plugin oggflac_decoder_plugin = {
+const struct DecoderPlugin oggflac_decoder_plugin = {
 	"oggflac",
 	oggflac_init,
 	nullptr,
@@ -377,7 +377,7 @@ static const char *const flac_mime_types[] = {
 	nullptr
 };
 
-const struct decoder_plugin flac_decoder_plugin = {
+const struct DecoderPlugin flac_decoder_plugin = {
 	"flac",
 	nullptr,
 	nullptr,
diff --git a/src/decoder/FlacDecoderPlugin.h b/src/decoder/FlacDecoderPlugin.h
index c99deeef7..936423fbf 100644
--- a/src/decoder/FlacDecoderPlugin.h
+++ b/src/decoder/FlacDecoderPlugin.h
@@ -20,7 +20,7 @@
 #ifndef MPD_DECODER_FLAC_H
 #define MPD_DECODER_FLAC_H
 
-extern const struct decoder_plugin flac_decoder_plugin;
-extern const struct decoder_plugin oggflac_decoder_plugin;
+extern const struct DecoderPlugin flac_decoder_plugin;
+extern const struct DecoderPlugin oggflac_decoder_plugin;
 
 #endif
diff --git a/src/decoder/FluidsynthDecoderPlugin.cxx b/src/decoder/FluidsynthDecoderPlugin.cxx
index 5b8909492..93d935c6c 100644
--- a/src/decoder/FluidsynthDecoderPlugin.cxx
+++ b/src/decoder/FluidsynthDecoderPlugin.cxx
@@ -210,7 +210,7 @@ static const char *const fluidsynth_suffixes[] = {
 	nullptr
 };
 
-const struct decoder_plugin fluidsynth_decoder_plugin = {
+const struct DecoderPlugin fluidsynth_decoder_plugin = {
 	"fluidsynth",
 	fluidsynth_init,
 	nullptr,
diff --git a/src/decoder/FluidsynthDecoderPlugin.hxx b/src/decoder/FluidsynthDecoderPlugin.hxx
index 40ed7e4d8..9771898a5 100644
--- a/src/decoder/FluidsynthDecoderPlugin.hxx
+++ b/src/decoder/FluidsynthDecoderPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_DECODER_FLUIDSYNTH_HXX
 #define MPD_DECODER_FLUIDSYNTH_HXX
 
-extern const struct decoder_plugin fluidsynth_decoder_plugin;
+extern const struct DecoderPlugin fluidsynth_decoder_plugin;
 
 #endif
diff --git a/src/decoder/GmeDecoderPlugin.cxx b/src/decoder/GmeDecoderPlugin.cxx
index 3a68e2321..76b0eea9d 100644
--- a/src/decoder/GmeDecoderPlugin.cxx
+++ b/src/decoder/GmeDecoderPlugin.cxx
@@ -279,8 +279,8 @@ static const char *const gme_suffixes[] = {
 	nullptr
 };
 
-extern const struct decoder_plugin gme_decoder_plugin;
-const struct decoder_plugin gme_decoder_plugin = {
+extern const struct DecoderPlugin gme_decoder_plugin;
+const struct DecoderPlugin gme_decoder_plugin = {
 	"gme",
 	nullptr,
 	nullptr,
diff --git a/src/decoder/GmeDecoderPlugin.hxx b/src/decoder/GmeDecoderPlugin.hxx
index fba735d92..e46dc766a 100644
--- a/src/decoder/GmeDecoderPlugin.hxx
+++ b/src/decoder/GmeDecoderPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_DECODER_GME_HXX
 #define MPD_DECODER_GME_HXX
 
-extern const struct decoder_plugin gme_decoder_plugin;
+extern const struct DecoderPlugin gme_decoder_plugin;
 
 #endif
diff --git a/src/decoder/MadDecoderPlugin.cxx b/src/decoder/MadDecoderPlugin.cxx
index 260ee1900..e36bfeaac 100644
--- a/src/decoder/MadDecoderPlugin.cxx
+++ b/src/decoder/MadDecoderPlugin.cxx
@@ -1171,7 +1171,7 @@ mad_decoder_scan_stream(struct input_stream *is,
 static const char *const mp3_suffixes[] = { "mp3", "mp2", nullptr };
 static const char *const mp3_mime_types[] = { "audio/mpeg", nullptr };
 
-const struct decoder_plugin mad_decoder_plugin = {
+const struct DecoderPlugin mad_decoder_plugin = {
 	"mad",
 	mp3_plugin_init,
 	nullptr,
diff --git a/src/decoder/MadDecoderPlugin.hxx b/src/decoder/MadDecoderPlugin.hxx
index c7a77304c..450323670 100644
--- a/src/decoder/MadDecoderPlugin.hxx
+++ b/src/decoder/MadDecoderPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_DECODER_MAD_HXX
 #define MPD_DECODER_MAD_HXX
 
-extern const struct decoder_plugin mad_decoder_plugin;
+extern const struct DecoderPlugin mad_decoder_plugin;
 
 #endif
diff --git a/src/decoder/MikmodDecoderPlugin.cxx b/src/decoder/MikmodDecoderPlugin.cxx
index 2b0978d45..e2d8d76d1 100644
--- a/src/decoder/MikmodDecoderPlugin.cxx
+++ b/src/decoder/MikmodDecoderPlugin.cxx
@@ -234,7 +234,7 @@ static const char *const mikmod_decoder_suffixes[] = {
 	nullptr
 };
 
-const struct decoder_plugin mikmod_decoder_plugin = {
+const struct DecoderPlugin mikmod_decoder_plugin = {
 	"mikmod",
 	mikmod_decoder_init,
 	mikmod_decoder_finish,
diff --git a/src/decoder/MikmodDecoderPlugin.hxx b/src/decoder/MikmodDecoderPlugin.hxx
index dd3b1389e..d25c5f6e7 100644
--- a/src/decoder/MikmodDecoderPlugin.hxx
+++ b/src/decoder/MikmodDecoderPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_DECODER_MIKMOD_HXX
 #define MPD_DECODER_MIKMOD_HXX
 
-extern const struct decoder_plugin mikmod_decoder_plugin;
+extern const struct DecoderPlugin mikmod_decoder_plugin;
 
 #endif
diff --git a/src/decoder/ModplugDecoderPlugin.cxx b/src/decoder/ModplugDecoderPlugin.cxx
index 0d79b7283..d8c911f8e 100644
--- a/src/decoder/ModplugDecoderPlugin.cxx
+++ b/src/decoder/ModplugDecoderPlugin.cxx
@@ -200,7 +200,7 @@ static const char *const mod_suffixes[] = {
 	nullptr
 };
 
-const struct decoder_plugin modplug_decoder_plugin = {
+const struct DecoderPlugin modplug_decoder_plugin = {
 	"modplug",
 	modplug_decoder_init,
 	nullptr,
diff --git a/src/decoder/ModplugDecoderPlugin.hxx b/src/decoder/ModplugDecoderPlugin.hxx
index fefb02b05..4cd9f5b25 100644
--- a/src/decoder/ModplugDecoderPlugin.hxx
+++ b/src/decoder/ModplugDecoderPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_DECODER_MODPLUG_HXX
 #define MPD_DECODER_MODPLUG_HXX
 
-extern const struct decoder_plugin modplug_decoder_plugin;
+extern const struct DecoderPlugin modplug_decoder_plugin;
 
 #endif
diff --git a/src/decoder/MpcdecDecoderPlugin.cxx b/src/decoder/MpcdecDecoderPlugin.cxx
index dd3319831..cc16ad838 100644
--- a/src/decoder/MpcdecDecoderPlugin.cxx
+++ b/src/decoder/MpcdecDecoderPlugin.cxx
@@ -267,7 +267,7 @@ mpcdec_scan_stream(struct input_stream *is,
 
 static const char *const mpcdec_suffixes[] = { "mpc", nullptr };
 
-const struct decoder_plugin mpcdec_decoder_plugin = {
+const struct DecoderPlugin mpcdec_decoder_plugin = {
 	"mpcdec",
 	nullptr,
 	nullptr,
diff --git a/src/decoder/MpcdecDecoderPlugin.hxx b/src/decoder/MpcdecDecoderPlugin.hxx
index 7e9b51cdb..23ecc801e 100644
--- a/src/decoder/MpcdecDecoderPlugin.hxx
+++ b/src/decoder/MpcdecDecoderPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_DECODER_MPCDEC_HXX
 #define MPD_DECODER_MPCDEC_HXX
 
-extern const struct decoder_plugin mpcdec_decoder_plugin;
+extern const struct DecoderPlugin mpcdec_decoder_plugin;
 
 #endif
diff --git a/src/decoder/Mpg123DecoderPlugin.cxx b/src/decoder/Mpg123DecoderPlugin.cxx
index 524716d06..9aa06831f 100644
--- a/src/decoder/Mpg123DecoderPlugin.cxx
+++ b/src/decoder/Mpg123DecoderPlugin.cxx
@@ -241,7 +241,7 @@ static const char *const mpg123_suffixes[] = {
 	nullptr
 };
 
-const struct decoder_plugin mpg123_decoder_plugin = {
+const struct DecoderPlugin mpg123_decoder_plugin = {
 	"mpg123",
 	mpd_mpg123_init,
 	mpd_mpg123_finish,
diff --git a/src/decoder/Mpg123DecoderPlugin.hxx b/src/decoder/Mpg123DecoderPlugin.hxx
index 273b03eaf..10f7c37f5 100644
--- a/src/decoder/Mpg123DecoderPlugin.hxx
+++ b/src/decoder/Mpg123DecoderPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_DECODER_MPG123_HXX
 #define MPD_DECODER_MPG123_HXX
 
-extern const struct decoder_plugin mpg123_decoder_plugin;
+extern const struct DecoderPlugin mpg123_decoder_plugin;
 
 #endif
diff --git a/src/decoder/OpusDecoderPlugin.cxx b/src/decoder/OpusDecoderPlugin.cxx
index 96c52a083..ade611e31 100644
--- a/src/decoder/OpusDecoderPlugin.cxx
+++ b/src/decoder/OpusDecoderPlugin.cxx
@@ -389,7 +389,7 @@ static const char *const opus_mime_types[] = {
 	nullptr
 };
 
-const struct decoder_plugin opus_decoder_plugin = {
+const struct DecoderPlugin opus_decoder_plugin = {
 	"opus",
 	mpd_opus_init,
 	nullptr,
diff --git a/src/decoder/OpusDecoderPlugin.h b/src/decoder/OpusDecoderPlugin.h
index c95d6ded3..263ac6e2d 100644
--- a/src/decoder/OpusDecoderPlugin.h
+++ b/src/decoder/OpusDecoderPlugin.h
@@ -20,6 +20,6 @@
 #ifndef MPD_DECODER_OPUS_H
 #define MPD_DECODER_OPUS_H
 
-extern const struct decoder_plugin opus_decoder_plugin;
+extern const struct DecoderPlugin opus_decoder_plugin;
 
 #endif
diff --git a/src/decoder/PcmDecoderPlugin.cxx b/src/decoder/PcmDecoderPlugin.cxx
index 874fb5b89..8cde45cd7 100644
--- a/src/decoder/PcmDecoderPlugin.cxx
+++ b/src/decoder/PcmDecoderPlugin.cxx
@@ -100,7 +100,7 @@ static const char *const pcm_mime_types[] = {
 	nullptr
 };
 
-const struct decoder_plugin pcm_decoder_plugin = {
+const struct DecoderPlugin pcm_decoder_plugin = {
 	"pcm",
 	nullptr,
 	nullptr,
diff --git a/src/decoder/PcmDecoderPlugin.hxx b/src/decoder/PcmDecoderPlugin.hxx
index 2883e866e..38e4a5020 100644
--- a/src/decoder/PcmDecoderPlugin.hxx
+++ b/src/decoder/PcmDecoderPlugin.hxx
@@ -28,6 +28,6 @@
 #ifndef MPD_DECODER_PCM_HXX
 #define MPD_DECODER_PCM_HXX
 
-extern const struct decoder_plugin pcm_decoder_plugin;
+extern const struct DecoderPlugin pcm_decoder_plugin;
 
 #endif
diff --git a/src/decoder/SidplayDecoderPlugin.cxx b/src/decoder/SidplayDecoderPlugin.cxx
index 1ee8dcc42..a31eee3a8 100644
--- a/src/decoder/SidplayDecoderPlugin.cxx
+++ b/src/decoder/SidplayDecoderPlugin.cxx
@@ -420,8 +420,8 @@ static const char *const sidplay_suffixes[] = {
 	nullptr
 };
 
-extern const struct decoder_plugin sidplay_decoder_plugin;
-const struct decoder_plugin sidplay_decoder_plugin = {
+extern const struct DecoderPlugin sidplay_decoder_plugin;
+const struct DecoderPlugin sidplay_decoder_plugin = {
 	"sidplay",
 	sidplay_init,
 	sidplay_finish,
diff --git a/src/decoder/SidplayDecoderPlugin.hxx b/src/decoder/SidplayDecoderPlugin.hxx
index 0b96f8e3a..16544801f 100644
--- a/src/decoder/SidplayDecoderPlugin.hxx
+++ b/src/decoder/SidplayDecoderPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_DECODER_SIDPLAY_HXX
 #define MPD_DECODER_SIDPLAY_HXX
 
-extern const struct decoder_plugin sidplay_decoder_plugin;
+extern const struct DecoderPlugin sidplay_decoder_plugin;
 
 #endif
diff --git a/src/decoder/SndfileDecoderPlugin.cxx b/src/decoder/SndfileDecoderPlugin.cxx
index 5c7efe230..6f4c5bb33 100644
--- a/src/decoder/SndfileDecoderPlugin.cxx
+++ b/src/decoder/SndfileDecoderPlugin.cxx
@@ -246,7 +246,7 @@ static const char *const sndfile_mime_types[] = {
 	nullptr
 };
 
-const struct decoder_plugin sndfile_decoder_plugin = {
+const struct DecoderPlugin sndfile_decoder_plugin = {
 	"sndfile",
 	nullptr,
 	nullptr,
diff --git a/src/decoder/SndfileDecoderPlugin.hxx b/src/decoder/SndfileDecoderPlugin.hxx
index ba60fafd0..f8aa65680 100644
--- a/src/decoder/SndfileDecoderPlugin.hxx
+++ b/src/decoder/SndfileDecoderPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_DECODER_SNDFILE_HXX
 #define MPD_DECODER_SNDFILE_HXX
 
-extern const struct decoder_plugin sndfile_decoder_plugin;
+extern const struct DecoderPlugin sndfile_decoder_plugin;
 
 #endif
diff --git a/src/decoder/VorbisDecoderPlugin.cxx b/src/decoder/VorbisDecoderPlugin.cxx
index 52e0609b8..a7fbb9290 100644
--- a/src/decoder/VorbisDecoderPlugin.cxx
+++ b/src/decoder/VorbisDecoderPlugin.cxx
@@ -338,7 +338,7 @@ static const char *const vorbis_mime_types[] = {
 	NULL
 };
 
-const struct decoder_plugin vorbis_decoder_plugin = {
+const struct DecoderPlugin vorbis_decoder_plugin = {
 	"vorbis",
 	nullptr,
 	nullptr,
diff --git a/src/decoder/VorbisDecoderPlugin.h b/src/decoder/VorbisDecoderPlugin.h
index 618c9ffde..54953d83a 100644
--- a/src/decoder/VorbisDecoderPlugin.h
+++ b/src/decoder/VorbisDecoderPlugin.h
@@ -20,6 +20,6 @@
 #ifndef MPD_DECODER_VORBIS_H
 #define MPD_DECODER_VORBIS_H
 
-extern const struct decoder_plugin vorbis_decoder_plugin;
+extern const struct DecoderPlugin vorbis_decoder_plugin;
 
 #endif
diff --git a/src/decoder/WavpackDecoderPlugin.cxx b/src/decoder/WavpackDecoderPlugin.cxx
index 4bdf2122a..098436c4f 100644
--- a/src/decoder/WavpackDecoderPlugin.cxx
+++ b/src/decoder/WavpackDecoderPlugin.cxx
@@ -585,7 +585,7 @@ static char const *const wavpack_mime_types[] = {
 	nullptr
 };
 
-const struct decoder_plugin wavpack_decoder_plugin = {
+const struct DecoderPlugin wavpack_decoder_plugin = {
 	"wavpack",
 	nullptr,
 	nullptr,
diff --git a/src/decoder/WavpackDecoderPlugin.hxx b/src/decoder/WavpackDecoderPlugin.hxx
index 9ebe6354f..3a2d94532 100644
--- a/src/decoder/WavpackDecoderPlugin.hxx
+++ b/src/decoder/WavpackDecoderPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_DECODER_WAVPACK_HXX
 #define MPD_DECODER_WAVPACK_HXX
 
-extern const struct decoder_plugin wavpack_decoder_plugin;
+extern const struct DecoderPlugin wavpack_decoder_plugin;
 
 #endif
diff --git a/src/decoder/WildmidiDecoderPlugin.cxx b/src/decoder/WildmidiDecoderPlugin.cxx
index 3454d23dc..0b2ffb6c3 100644
--- a/src/decoder/WildmidiDecoderPlugin.cxx
+++ b/src/decoder/WildmidiDecoderPlugin.cxx
@@ -144,7 +144,7 @@ static const char *const wildmidi_suffixes[] = {
 	nullptr
 };
 
-const struct decoder_plugin wildmidi_decoder_plugin = {
+const struct DecoderPlugin wildmidi_decoder_plugin = {
 	"wildmidi",
 	wildmidi_init,
 	wildmidi_finish,
diff --git a/src/decoder/WildmidiDecoderPlugin.hxx b/src/decoder/WildmidiDecoderPlugin.hxx
index 956b72299..a6289612e 100644
--- a/src/decoder/WildmidiDecoderPlugin.hxx
+++ b/src/decoder/WildmidiDecoderPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef MPD_DECODER_WILDMIDI_HXX
 #define MPD_DECODER_WILDMIDI_HXX
 
-extern const struct decoder_plugin wildmidi_decoder_plugin;
+extern const struct DecoderPlugin wildmidi_decoder_plugin;
 
 #endif