3 files changed, 78 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index ef4bb5036..0ca65adb8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -900,6 +900,7 @@ endif
 libdecoder_a_SOURCES = \
 	src/decoder/plugins/PcmDecoderPlugin.cxx \
 	src/decoder/plugins/PcmDecoderPlugin.hxx \
+	src/decoder/Reader.cxx src/decoder/Reader.hxx \
 	src/decoder/DecoderBuffer.cxx src/decoder/DecoderBuffer.hxx \
 	src/decoder/DecoderPlugin.cxx \
 	src/decoder/DecoderList.cxx src/decoder/DecoderList.hxx
diff --git a/src/decoder/Reader.cxx b/src/decoder/Reader.cxx
new file mode 100644
index 000000000..11d6e22eb
--- /dev/null
+++ b/src/decoder/Reader.cxx
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2003-2016 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+#include "Reader.hxx"
+#include "DecoderAPI.hxx"
+
+size_t
+DecoderReader::Read(void *data, size_t size)
+{
+	return decoder_read(decoder, is, data, size);
+}
diff --git a/src/decoder/Reader.hxx b/src/decoder/Reader.hxx
new file mode 100644
index 000000000..fb143b12a
--- /dev/null
+++ b/src/decoder/Reader.hxx
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2003-2016 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_DECODER_READER_HXX
+#define MPD_DECODER_READER_HXX
+
+#include "check.h"
+#include "fs/io/Reader.hxx"
+#include "Compiler.h"
+
+struct Decoder;
+class InputStream;
+
+/**
+ * A wrapper for decoder_read() which implements the #Reader
+ * interface.
+ */
+class DecoderReader final : public Reader {
+	Decoder *const decoder;
+	InputStream &is;
+
+public:
+	DecoderReader(Decoder &_decoder, InputStream &_is)
+		:decoder(&_decoder), is(_is) {}
+
+	DecoderReader(Decoder *_decoder, InputStream &_is)
+		:decoder(_decoder), is(_is) {}
+
+	/* virtual methods from class Reader */
+	size_t Read(void *data, size_t size) override;
+};
+
+#endif