3 files changed, 119 insertions, 0 deletions

diff --git a/src/decoder/pcm_decoder_plugin.c b/src/decoder/pcm_decoder_plugin.c
new file mode 100644
index 000000000..f63f1ec46
--- /dev/null
+++ b/src/decoder/pcm_decoder_plugin.c
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2003-2010 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 "decoder/pcm_decoder_plugin.h"
+#include "decoder_api.h"
+
+#include <glib.h>
+#include <unistd.h>
+
+#undef G_LOG_DOMAIN
+#define G_LOG_DOMAIN "pcm"
+
+static void
+pcm_stream_decode(struct decoder *decoder, struct input_stream *is)
+{
+	static const struct audio_format audio_format = {
+		.sample_rate = 44100,
+		.format = SAMPLE_FORMAT_S16,
+		.channels = 2,
+	};
+	GError *error = NULL;
+	enum decoder_command cmd;
+
+	double time_to_size = audio_format_time_to_size(&audio_format);
+
+	float total_time = -1;
+	if (is->size >= 0)
+		total_time = is->size / time_to_size;
+
+	decoder_initialized(decoder, &audio_format, true, total_time);
+
+	do {
+		char buffer[4096];
+
+		size_t nbytes = decoder_read(decoder, is,
+					     buffer, sizeof(buffer));
+		cmd = nbytes > 0
+			? decoder_data(decoder, is,
+				       buffer, nbytes, 0)
+			: decoder_get_command(decoder);
+		if (cmd == DECODE_COMMAND_SEEK) {
+			goffset offset = (goffset)(time_to_size *
+						   decoder_seek_where(decoder));
+			if (input_stream_seek(is, offset, SEEK_SET, &error)) {
+				decoder_command_finished(decoder);
+			} else {
+				g_warning("seeking failed: %s", error->message);
+				g_error_free(error);
+				decoder_seek_error(decoder);
+			}
+
+			cmd = DECODE_COMMAND_NONE;
+		}
+	} while (cmd == DECODE_COMMAND_NONE);
+}
+
+static const char *const pcm_mime_types[] = {
+	/* for streams obtained by the cdio_paranoia input plugin */
+	"audio/x-mpd-cdda-pcm",
+	NULL
+};
+
+const struct decoder_plugin pcm_decoder_plugin = {
+	.name = "pcm",
+	.stream_decode = pcm_stream_decode,
+	.mime_types = pcm_mime_types,
+};
diff --git a/src/decoder/pcm_decoder_plugin.h b/src/decoder/pcm_decoder_plugin.h
new file mode 100644
index 000000000..716ae0c3e
--- /dev/null
+++ b/src/decoder/pcm_decoder_plugin.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2003-2010 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.
+ */
+
+/** \file
+ *
+ * Not really a decoder; this plugin forwards its input data "as-is".
+ *
+ * It was written only to support the "cdio_paranoia" input plugin,
+ * which does not need a decoder.
+ */
+
+#ifndef MPD_DECODER_PCM_H
+#define MPD_DECODER_PCM_H
+
+extern const struct decoder_plugin pcm_decoder_plugin;
+
+#endif
diff --git a/src/decoder_list.c b/src/decoder_list.c
index d76050023..4d8562be6 100644
--- a/src/decoder_list.c
+++ b/src/decoder_list.c
@@ -23,6 +23,7 @@
 #include "utils.h"
 #include "conf.h"
 #include "mpd_error.h"
+#include "decoder/pcm_decoder_plugin.h"
 
 #include <glib.h>
 
@@ -102,6 +103,7 @@ const struct decoder_plugin *const decoder_plugins[] = {
 #ifdef HAVE_GME
 	&gme_decoder_plugin,
 #endif
+	&pcm_decoder_plugin,
 	NULL
 };