4 files changed, 7 insertions, 6 deletions
diff --git a/src/decoder/DecoderAPI.cxx b/src/decoder/DecoderAPI.cxx
index 5c4822804..b214b91a8 100644
--- a/src/decoder/DecoderAPI.cxx
+++ b/src/decoder/DecoderAPI.cxx
@@ -387,7 +387,7 @@ decoder_timestamp(Decoder &decoder, double t)
 static DecoderCommand
 do_send_tag(Decoder &decoder, const Tag &tag)
 {
-	struct music_chunk *chunk;
+	MusicChunk *chunk;
 
 	if (decoder.chunk != nullptr) {
 		/* there is a partial chunk - flush it, we want the
@@ -487,7 +487,7 @@ decoder_data(Decoder &decoder,
 	}
 
 	while (length > 0) {
-		struct music_chunk *chunk;
+		MusicChunk *chunk;
 		bool full;
 
 		chunk = decoder.GetChunk();
diff --git a/src/decoder/DecoderControl.hxx b/src/decoder/DecoderControl.hxx
index 4e5c43b5a..f78ce1a31 100644
--- a/src/decoder/DecoderControl.hxx
+++ b/src/decoder/DecoderControl.hxx
@@ -144,7 +144,7 @@ struct DecoderControl {
 
 	float total_time;
 
-	/** the #music_chunk allocator */
+	/** the #MusicChunk allocator */
 	MusicBuffer *buffer;
 
 	/**
diff --git a/src/decoder/DecoderInternal.cxx b/src/decoder/DecoderInternal.cxx
index b50fee185..416a75b75 100644
--- a/src/decoder/DecoderInternal.cxx
+++ b/src/decoder/DecoderInternal.cxx
@@ -56,7 +56,7 @@ need_chunks(DecoderControl &dc)
 	return dc.command;
 }
 
-struct music_chunk *
+MusicChunk *
 Decoder::GetChunk()
 {
 	DecoderCommand cmd;
diff --git a/src/decoder/DecoderInternal.hxx b/src/decoder/DecoderInternal.hxx
index bef6f6c13..e6c30d071 100644
--- a/src/decoder/DecoderInternal.hxx
+++ b/src/decoder/DecoderInternal.hxx
@@ -24,6 +24,7 @@
 #include "util/Error.hxx"
 
 class PcmConvert;
+struct MusicChunk;
 struct DecoderControl;
 struct Tag;
 
@@ -76,7 +77,7 @@ struct Decoder {
 	Tag *decoder_tag;
 
 	/** the chunk currently being written to */
-	struct music_chunk *chunk;
+	MusicChunk *chunk;
 
 	ReplayGainInfo replay_gain_info;
 
@@ -112,7 +113,7 @@ struct Decoder {
 	 *
 	 * @return the chunk, or NULL if we have received a decoder command
 	 */
-	music_chunk *GetChunk();
+	MusicChunk *GetChunk();
 
 	/**
 	 * Flushes the current chunk.