23 files changed, 829 insertions, 105 deletions

diff --git a/src/encoder/EncoderAPI.hxx b/src/encoder/EncoderAPI.hxx
new file mode 100644
index 000000000..b147eac21
--- /dev/null
+++ b/src/encoder/EncoderAPI.hxx
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2003-2014 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.
+ */
+
+/*
+ * This header is included by encoder plugins.
+ *
+ */
+
+#ifndef MPD_ENCODER_API_HXX
+#define MPD_ENCODER_API_HXX
+
+// IWYU pragma: begin_exports
+
+#include "EncoderPlugin.hxx"
+#include "AudioFormat.hxx"
+#include "tag/Tag.hxx"
+#include "config/ConfigData.hxx"
+
+// IWYU pragma: end_exports
+
+#endif
diff --git a/src/encoder/EncoderList.cxx b/src/encoder/EncoderList.cxx
new file mode 100644
index 000000000..4bca5a4fe
--- /dev/null
+++ b/src/encoder/EncoderList.cxx
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2003-2014 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 "EncoderList.hxx"
+#include "EncoderPlugin.hxx"
+#include "plugins/NullEncoderPlugin.hxx"
+#include "plugins/WaveEncoderPlugin.hxx"
+#include "plugins/VorbisEncoderPlugin.hxx"
+#include "plugins/OpusEncoderPlugin.hxx"
+#include "plugins/FlacEncoderPlugin.hxx"
+#include "plugins/ShineEncoderPlugin.hxx"
+#include "plugins/LameEncoderPlugin.hxx"
+#include "plugins/TwolameEncoderPlugin.hxx"
+
+#include <string.h>
+
+const EncoderPlugin *const encoder_plugins[] = {
+	&null_encoder_plugin,
+#ifdef ENABLE_VORBIS_ENCODER
+	&vorbis_encoder_plugin,
+#endif
+#ifdef HAVE_OPUS
+	&opus_encoder_plugin,
+#endif
+#ifdef ENABLE_LAME_ENCODER
+	&lame_encoder_plugin,
+#endif
+#ifdef ENABLE_TWOLAME_ENCODER
+	&twolame_encoder_plugin,
+#endif
+#ifdef ENABLE_WAVE_ENCODER
+	&wave_encoder_plugin,
+#endif
+#ifdef ENABLE_FLAC_ENCODER
+	&flac_encoder_plugin,
+#endif
+#ifdef ENABLE_SHINE_ENCODER
+	&shine_encoder_plugin,
+#endif
+	nullptr
+};
+
+const EncoderPlugin *
+encoder_plugin_get(const char *name)
+{
+	encoder_plugins_for_each(plugin)
+		if (strcmp(plugin->name, name) == 0)
+			return plugin;
+
+	return nullptr;
+}
diff --git a/src/encoder/EncoderList.hxx b/src/encoder/EncoderList.hxx
new file mode 100644
index 000000000..e18d8ec74
--- /dev/null
+++ b/src/encoder/EncoderList.hxx
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2003-2014 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_ENCODER_LIST_HXX
+#define MPD_ENCODER_LIST_HXX
+
+struct EncoderPlugin;
+
+extern const EncoderPlugin *const encoder_plugins[];
+
+#define encoder_plugins_for_each(plugin) \
+	for (const EncoderPlugin *plugin, \
+		*const*encoder_plugin_iterator = &encoder_plugins[0]; \
+		(plugin = *encoder_plugin_iterator) != nullptr; \
+		++encoder_plugin_iterator)
+
+/**
+ * Looks up an encoder plugin by its name.
+ *
+ * @param name the encoder name to look for
+ * @return the encoder plugin with the specified name, or nullptr if none
+ * was found
+ */
+const EncoderPlugin *
+encoder_plugin_get(const char *name);
+
+#endif
diff --git a/src/encoder/EncoderPlugin.hxx b/src/encoder/EncoderPlugin.hxx
new file mode 100644
index 000000000..95e4e5838
--- /dev/null
+++ b/src/encoder/EncoderPlugin.hxx
@@ -0,0 +1,321 @@
+/*
+ * Copyright (C) 2003-2014 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_ENCODER_PLUGIN_HXX
+#define MPD_ENCODER_PLUGIN_HXX
+
+#include <assert.h>
+#include <stdbool.h>
+#include <stddef.h>
+
+struct EncoderPlugin;
+struct AudioFormat;
+struct config_param;
+struct Tag;
+class Error;
+
+struct Encoder {
+	const EncoderPlugin &plugin;
+
+#ifndef NDEBUG
+	bool open, pre_tag, tag, end;
+#endif
+
+	explicit Encoder(const EncoderPlugin &_plugin)
+		:plugin(_plugin)
+#ifndef NDEBUG
+		, open(false)
+#endif
+	{}
+};
+
+struct EncoderPlugin {
+	const char *name;
+
+	Encoder *(*init)(const config_param &param,
+			 Error &error);
+
+	void (*finish)(Encoder *encoder);
+
+	bool (*open)(Encoder *encoder,
+		     AudioFormat &audio_format,
+		     Error &error);
+
+	void (*close)(Encoder *encoder);
+
+	bool (*end)(Encoder *encoder, Error &error);
+
+	bool (*flush)(Encoder *encoder, Error &error);
+
+	bool (*pre_tag)(Encoder *encoder, Error &error);
+
+	bool (*tag)(Encoder *encoder, const Tag *tag,
+		    Error &error);
+
+	bool (*write)(Encoder *encoder,
+		      const void *data, size_t length,
+		      Error &error);
+
+	size_t (*read)(Encoder *encoder, void *dest, size_t length);
+
+	const char *(*get_mime_type)(Encoder *encoder);
+};
+
+/**
+ * Creates a new encoder object.
+ *
+ * @param plugin the encoder plugin
+ * @param param optional configuration
+ * @param error location to store the error occurring, or nullptr to ignore errors.
+ * @return an encoder object on success, nullptr on failure
+ */
+static inline Encoder *
+encoder_init(const EncoderPlugin &plugin, const config_param &param,
+	     Error &error_r)
+{
+	return plugin.init(param, error_r);
+}
+
+/**
+ * Frees an encoder object.
+ *
+ * @param encoder the encoder
+ */
+static inline void
+encoder_finish(Encoder *encoder)
+{
+	assert(!encoder->open);
+
+	encoder->plugin.finish(encoder);
+}
+
+/**
+ * Opens an encoder object.  You must call this prior to using it.
+ * Before you free it, you must call encoder_close().  You may open
+ * and close (reuse) one encoder any number of times.
+ *
+ * After this function returns successfully and before the first
+ * encoder_write() call, you should invoke encoder_read() to obtain
+ * the file header.
+ *
+ * @param encoder the encoder
+ * @param audio_format the encoder's input audio format; the plugin
+ * may modify the struct to adapt it to its abilities
+ * @return true on success
+ */
+static inline bool
+encoder_open(Encoder *encoder, AudioFormat &audio_format,
+	     Error &error)
+{
+	assert(!encoder->open);
+
+	bool success = encoder->plugin.open(encoder, audio_format, error);
+#ifndef NDEBUG
+	encoder->open = success;
+	encoder->pre_tag = encoder->tag = encoder->end = false;
+#endif
+	return success;
+}
+
+/**
+ * Closes an encoder object.  This disables the encoder, and readies
+ * it for reusal by calling encoder_open() again.
+ *
+ * @param encoder the encoder
+ */
+static inline void
+encoder_close(Encoder *encoder)
+{
+	assert(encoder->open);
+
+	if (encoder->plugin.close != nullptr)
+		encoder->plugin.close(encoder);
+
+#ifndef NDEBUG
+	encoder->open = false;
+#endif
+}
+
+/**
+ * Ends the stream: flushes the encoder object, generate an
+ * end-of-stream marker (if applicable), make everything which might
+ * currently be buffered available by encoder_read().
+ *
+ * After this function has been called, the encoder may not be usable
+ * for more data, and only encoder_read() and encoder_close() can be
+ * called.
+ *
+ * @param encoder the encoder
+ * @return true on success
+ */
+static inline bool
+encoder_end(Encoder *encoder, Error &error)
+{
+	assert(encoder->open);
+	assert(!encoder->end);
+
+#ifndef NDEBUG
+	encoder->end = true;
+#endif
+
+	/* this method is optional */
+	return encoder->plugin.end != nullptr
+		? encoder->plugin.end(encoder, error)
+		: true;
+}
+
+/**
+ * Flushes an encoder object, make everything which might currently be
+ * buffered available by encoder_read().
+ *
+ * @param encoder the encoder
+ * @return true on success
+ */
+static inline bool
+encoder_flush(Encoder *encoder, Error &error)
+{
+	assert(encoder->open);
+	assert(!encoder->pre_tag);
+	assert(!encoder->tag);
+	assert(!encoder->end);
+
+	/* this method is optional */
+	return encoder->plugin.flush != nullptr
+		? encoder->plugin.flush(encoder, error)
+		: true;
+}
+
+/**
+ * Prepare for sending a tag to the encoder.  This is used by some
+ * encoders to flush the previous sub-stream, in preparation to begin
+ * a new one.
+ *
+ * @param encoder the encoder
+ * @param tag the tag object
+ * @return true on success
+ */
+static inline bool
+encoder_pre_tag(Encoder *encoder, Error &error)
+{
+	assert(encoder->open);
+	assert(!encoder->pre_tag);
+	assert(!encoder->tag);
+	assert(!encoder->end);
+
+	/* this method is optional */
+	bool success = encoder->plugin.pre_tag != nullptr
+		? encoder->plugin.pre_tag(encoder, error)
+		: true;
+
+#ifndef NDEBUG
+	encoder->pre_tag = success;
+#endif
+	return success;
+}
+
+/**
+ * Sends a tag to the encoder.
+ *
+ * Instructions: call encoder_pre_tag(); then obtain flushed data with
+ * encoder_read(); finally call encoder_tag().
+ *
+ * @param encoder the encoder
+ * @param tag the tag object
+ * @return true on success
+ */
+static inline bool
+encoder_tag(Encoder *encoder, const Tag *tag, Error &error)
+{
+	assert(encoder->open);
+	assert(!encoder->pre_tag);
+	assert(encoder->tag);
+	assert(!encoder->end);
+
+#ifndef NDEBUG
+	encoder->tag = false;
+#endif
+
+	/* this method is optional */
+	return encoder->plugin.tag != nullptr
+		? encoder->plugin.tag(encoder, tag, error)
+		: true;
+}
+
+/**
+ * Writes raw PCM data to the encoder.
+ *
+ * @param encoder the encoder
+ * @param data the buffer containing PCM samples
+ * @param length the length of the buffer in bytes
+ * @return true on success
+ */
+static inline bool
+encoder_write(Encoder *encoder, const void *data, size_t length,
+	      Error &error)
+{
+	assert(encoder->open);
+	assert(!encoder->pre_tag);
+	assert(!encoder->tag);
+	assert(!encoder->end);
+
+	return encoder->plugin.write(encoder, data, length, error);
+}
+
+/**
+ * Reads encoded data from the encoder.
+ *
+ * Call this repeatedly until no more data is returned.
+ *
+ * @param encoder the encoder
+ * @param dest the destination buffer to copy to
+ * @param length the maximum length of the destination buffer
+ * @return the number of bytes written to #dest
+ */
+static inline size_t
+encoder_read(Encoder *encoder, void *dest, size_t length)
+{
+	assert(encoder->open);
+	assert(!encoder->pre_tag || !encoder->tag);
+
+#ifndef NDEBUG
+	if (encoder->pre_tag) {
+		encoder->pre_tag = false;
+		encoder->tag = true;
+	}
+#endif
+
+	return encoder->plugin.read(encoder, dest, length);
+}
+
+/**
+ * Get mime type of encoded content.
+ *
+ * @param plugin the encoder plugin
+ * @return an constant string, nullptr on failure
+ */
+static inline const char *
+encoder_get_mime_type(Encoder *encoder)
+{
+	/* this method is optional */
+	return encoder->plugin.get_mime_type != nullptr
+		? encoder->plugin.get_mime_type(encoder)
+		: nullptr;
+}
+
+#endif
diff --git a/src/encoder/FlacEncoderPlugin.cxx b/src/encoder/plugins/FlacEncoderPlugin.cxx
index fa7ed992d..26987fe99 100644
--- a/src/encoder/FlacEncoderPlugin.cxx
+++ b/src/encoder/plugins/FlacEncoderPlugin.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,20 +19,14 @@
 
 #include "config.h"
 #include "FlacEncoderPlugin.hxx"
-#include "EncoderAPI.hxx"
+#include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
 #include "pcm/PcmBuffer.hxx"
-#include "ConfigError.hxx"
+#include "config/ConfigError.hxx"
+#include "util/Manual.hxx"
+#include "util/DynamicFifoBuffer.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
-#include "util/fifo_buffer.h"
-
-extern "C" {
-#include "util/growing_fifo.h"
-}
-
-#include <assert.h>
-#include <string.h>
 
 #include <FLAC/stream_encoder.h>
 
@@ -54,7 +48,7 @@ struct flac_encoder {
 	 * This buffer will hold encoded data from libFLAC until it is
 	 * picked up with flac_encoder_read().
 	 */
-	struct fifo_buffer *output_buffer;
+	Manual<DynamicFifoBuffer<uint8_t>> output_buffer;
 
 	flac_encoder():encoder(flac_encoder_plugin) {}
 };
@@ -141,7 +135,7 @@ flac_write_callback(gcc_unused const FLAC__StreamEncoder *fse,
 	struct flac_encoder *encoder = (struct flac_encoder *) client_data;
 
 	//transfer data to buffer
-	growing_fifo_append(&encoder->output_buffer, data, bytes);
+	encoder->output_buffer->Append((const uint8_t *)data, bytes);
 
 	return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
 }
@@ -154,7 +148,7 @@ flac_encoder_close(Encoder *_encoder)
 	FLAC__stream_encoder_delete(encoder->fse);
 
 	encoder->expand_buffer.Clear();
-	fifo_buffer_free(encoder->output_buffer);
+	encoder->output_buffer.Destruct();
 }
 
 static bool
@@ -196,7 +190,7 @@ flac_encoder_open(Encoder *_encoder, AudioFormat &audio_format, Error &error)
 		return false;
 	}
 
-	encoder->output_buffer = growing_fifo_new();
+	encoder->output_buffer.Construct(8192);
 
 	/* this immediately outputs data through callback */
 
@@ -305,18 +299,7 @@ flac_encoder_read(Encoder *_encoder, void *dest, size_t length)
 {
 	struct flac_encoder *encoder = (struct flac_encoder *)_encoder;
 
-	size_t max_length;
-	const char *src = (const char *)
-		fifo_buffer_read(encoder->output_buffer, &max_length);
-	if (src == nullptr)
-		return 0;
-
-	if (length > max_length)
-		length = max_length;
-
-	memcpy(dest, src, length);
-	fifo_buffer_consume(encoder->output_buffer, length);
-	return length;
+	return encoder->output_buffer->Read((uint8_t *)dest, length);
 }
 
 static const char *
diff --git a/src/encoder/FlacEncoderPlugin.hxx b/src/encoder/plugins/FlacEncoderPlugin.hxx
index 928a7f93e..0cdc01600 100644
--- a/src/encoder/FlacEncoderPlugin.hxx
+++ b/src/encoder/plugins/FlacEncoderPlugin.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/encoder/LameEncoderPlugin.cxx b/src/encoder/plugins/LameEncoderPlugin.cxx
index 06082d16b..3878b52bb 100644
--- a/src/encoder/LameEncoderPlugin.cxx
+++ b/src/encoder/plugins/LameEncoderPlugin.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
 
 #include "config.h"
 #include "LameEncoderPlugin.hxx"
-#include "EncoderAPI.hxx"
+#include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
-#include "ConfigError.hxx"
+#include "config/ConfigError.hxx"
 #include "util/NumberParser.hxx"
 #include "util/ReusableArray.hxx"
 #include "util/Manual.hxx"
diff --git a/src/encoder/LameEncoderPlugin.hxx b/src/encoder/plugins/LameEncoderPlugin.hxx
index 49832baee..03e398f67 100644
--- a/src/encoder/LameEncoderPlugin.hxx
+++ b/src/encoder/plugins/LameEncoderPlugin.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/encoder/NullEncoderPlugin.cxx b/src/encoder/plugins/NullEncoderPlugin.cxx
index 3b1aae5e2..1d571d465 100644
--- a/src/encoder/NullEncoderPlugin.cxx
+++ b/src/encoder/plugins/NullEncoderPlugin.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,22 +19,20 @@
 
 #include "config.h"
 #include "NullEncoderPlugin.hxx"
-#include "EncoderAPI.hxx"
-#include "util/fifo_buffer.h"
-extern "C" {
-#include "util/growing_fifo.h"
-}
+#include "../EncoderAPI.hxx"
+#include "util/Manual.hxx"
+#include "util/DynamicFifoBuffer.hxx"
 #include "Compiler.h"
 
 #include <assert.h>
-#include <string.h>
 
 struct NullEncoder final {
 	Encoder encoder;
 
-	struct fifo_buffer *buffer;
+	Manual<DynamicFifoBuffer<uint8_t>> buffer;
 
-	NullEncoder():encoder(null_encoder_plugin) {}
+	NullEncoder()
+		:encoder(null_encoder_plugin) {}
 };
 
 static Encoder *
@@ -58,7 +56,7 @@ null_encoder_close(Encoder *_encoder)
 {
 	NullEncoder *encoder = (NullEncoder *)_encoder;
 
-	fifo_buffer_free(encoder->buffer);
+	encoder->buffer.Destruct();
 }
 
 
@@ -68,7 +66,7 @@ null_encoder_open(Encoder *_encoder,
 		  gcc_unused Error &error)
 {
 	NullEncoder *encoder = (NullEncoder *)_encoder;
-	encoder->buffer = growing_fifo_new();
+	encoder->buffer.Construct(8192);
 	return true;
 }
 
@@ -79,7 +77,7 @@ null_encoder_write(Encoder *_encoder,
 {
 	NullEncoder *encoder = (NullEncoder *)_encoder;
 
-	growing_fifo_append(&encoder->buffer, data, length);
+	encoder->buffer->Append((const uint8_t *)data, length);
 	return length;
 }
 
@@ -88,17 +86,7 @@ null_encoder_read(Encoder *_encoder, void *dest, size_t length)
 {
 	NullEncoder *encoder = (NullEncoder *)_encoder;
 
-	size_t max_length;
-	const void *src = fifo_buffer_read(encoder->buffer, &max_length);
-	if (src == nullptr)
-		return 0;
-
-	if (length > max_length)
-		length = max_length;
-
-	memcpy(dest, src, length);
-	fifo_buffer_consume(encoder->buffer, length);
-	return length;
+	return encoder->buffer->Read((uint8_t *)dest, length);
 }
 
 const EncoderPlugin null_encoder_plugin = {
diff --git a/src/encoder/NullEncoderPlugin.hxx b/src/encoder/plugins/NullEncoderPlugin.hxx
index b741a2f6d..6acf88e49 100644
--- a/src/encoder/NullEncoderPlugin.hxx
+++ b/src/encoder/plugins/NullEncoderPlugin.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/encoder/OggSerial.cxx b/src/encoder/plugins/OggSerial.cxx
index 0d4fc5a9f..677829439 100644
--- a/src/encoder/OggSerial.cxx
+++ b/src/encoder/plugins/OggSerial.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/encoder/OggSerial.hxx b/src/encoder/plugins/OggSerial.hxx
index 2e5a020c6..ceba8ebf9 100644
--- a/src/encoder/OggSerial.hxx
+++ b/src/encoder/plugins/OggSerial.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/encoder/OggStream.hxx b/src/encoder/plugins/OggStream.hxx
index e8dcdf970..805238c1d 100644
--- a/src/encoder/OggStream.hxx
+++ b/src/encoder/plugins/OggStream.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/encoder/OpusEncoderPlugin.cxx b/src/encoder/plugins/OpusEncoderPlugin.cxx
index 243dc0836..5cb65e4f2 100644
--- a/src/encoder/OpusEncoderPlugin.cxx
+++ b/src/encoder/plugins/OpusEncoderPlugin.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,9 +21,10 @@
 #include "OpusEncoderPlugin.hxx"
 #include "OggStream.hxx"
 #include "OggSerial.hxx"
-#include "EncoderAPI.hxx"
+#include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
-#include "ConfigError.hxx"
+#include "config/ConfigError.hxx"
+#include "util/Alloc.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 #include "system/ByteOrder.hxx"
@@ -31,8 +32,6 @@
 #include <opus.h>
 #include <ogg/ogg.h>
 
-#include <glib.h>
-
 #include <assert.h>
 #include <stdlib.h>
 
@@ -188,7 +187,7 @@ opus_encoder_open(Encoder *_encoder,
 	encoder->buffer_frames = audio_format.sample_rate / 50;
 	encoder->buffer_size = encoder->frame_size * encoder->buffer_frames;
 	encoder->buffer_position = 0;
-	encoder->buffer = (unsigned char *)g_malloc(encoder->buffer_size);
+	encoder->buffer = (unsigned char *)xalloc(encoder->buffer_size);
 
 	encoder->stream.Initialize(GenerateOggSerial());
 	encoder->packetno = 0;
@@ -202,7 +201,7 @@ opus_encoder_close(Encoder *_encoder)
 	struct opus_encoder *encoder = (struct opus_encoder *)_encoder;
 
 	encoder->stream.Deinitialize();
-	g_free(encoder->buffer);
+	free(encoder->buffer);
 	opus_encoder_destroy(encoder->enc);
 }
 
@@ -366,7 +365,7 @@ opus_encoder_generate_tags(struct opus_encoder *encoder)
 	size_t version_length = strlen(version);
 
 	size_t comments_size = 8 + 4 + version_length + 4;
-	unsigned char *comments = (unsigned char *)g_malloc(comments_size);
+	unsigned char *comments = (unsigned char *)xalloc(comments_size);
 	memcpy(comments, "OpusTags", 8);
 	*(uint32_t *)(comments + 8) = ToLE32(version_length);
 	memcpy(comments + 12, version, version_length);
@@ -382,7 +381,7 @@ opus_encoder_generate_tags(struct opus_encoder *encoder)
 	encoder->stream.PacketIn(packet);
 	encoder->stream.Flush();
 
-	g_free(comments);
+	free(comments);
 }
 
 static size_t
diff --git a/src/encoder/OpusEncoderPlugin.hxx b/src/encoder/plugins/OpusEncoderPlugin.hxx
index 3bb55e051..4e71694b9 100644
--- a/src/encoder/OpusEncoderPlugin.hxx
+++ b/src/encoder/plugins/OpusEncoderPlugin.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/encoder/plugins/ShineEncoderPlugin.cxx b/src/encoder/plugins/ShineEncoderPlugin.cxx
new file mode 100644
index 000000000..00b8eec7c
--- /dev/null
+++ b/src/encoder/plugins/ShineEncoderPlugin.cxx
@@ -0,0 +1,271 @@
+/*
+ * Copyright (C) 2003-2014 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 "ShineEncoderPlugin.hxx"
+#include "config.h"
+#include "../EncoderAPI.hxx"
+#include "AudioFormat.hxx"
+#include "config/ConfigError.hxx"
+#include "util/Manual.hxx"
+#include "util/NumberParser.hxx"
+#include "util/DynamicFifoBuffer.hxx"
+#include "util/Error.hxx"
+#include "util/Domain.hxx"
+
+extern "C"
+{
+#include <shine/layer3.h>
+}
+
+static constexpr size_t BUFFER_INIT_SIZE = 8192;
+static constexpr unsigned CHANNELS = 2;
+
+struct ShineEncoder {
+	Encoder encoder;
+
+	AudioFormat audio_format;
+
+	shine_t shine;
+
+	shine_config_t config;
+
+	size_t frame_size;
+	size_t input_pos;
+	int16_t *stereo[CHANNELS];
+
+	Manual<DynamicFifoBuffer<uint8_t>> output_buffer;
+
+	ShineEncoder():encoder(shine_encoder_plugin){}
+
+	bool Configure(const config_param &param, Error &error);
+
+	bool Setup(Error &error);
+
+	bool WriteChunk(bool flush);
+};
+
+static constexpr Domain shine_encoder_domain("shine_encoder");
+
+inline bool
+ShineEncoder::Configure(const config_param &param,
+			 gcc_unused Error &error)
+{
+	shine_set_config_mpeg_defaults(&config.mpeg);
+	config.mpeg.bitr = param.GetBlockValue("bitrate", 128);
+
+	return true;
+}
+
+static Encoder *
+shine_encoder_init(const config_param &param, Error &error)
+{
+	ShineEncoder *encoder = new ShineEncoder();
+
+	/* load configuration from "param" */
+	if (!encoder->Configure(param, error)) {
+		/* configuration has failed, roll back and return error */
+		delete encoder;
+		return nullptr;
+	}
+
+	return &encoder->encoder;
+}
+
+static void
+shine_encoder_finish(Encoder *_encoder)
+{
+	ShineEncoder *encoder = (ShineEncoder *)_encoder;
+
+	delete encoder;
+}
+
+inline bool
+ShineEncoder::Setup(Error &error)
+{
+	config.mpeg.mode = audio_format.channels == 2 ? STEREO : MONO;
+	config.wave.samplerate = audio_format.sample_rate;
+	config.wave.channels =
+		audio_format.channels == 2 ? PCM_STEREO : PCM_MONO;
+
+	if (shine_check_config(config.wave.samplerate, config.mpeg.bitr) < 0) {
+		error.Format(config_domain,
+			     "error configuring shine. "
+			     "samplerate %d and bitrate %d configuration"
+			     " not supported.",
+			     config.wave.samplerate,
+			     config.mpeg.bitr);
+
+		return false;
+	}
+
+	shine = shine_initialise(&config);
+
+	if (!shine) {
+		error.Format(config_domain,
+			     "error initializing shine.");
+
+		return false;
+	}
+
+	frame_size = shine_samples_per_pass(shine);
+
+	return true;
+}
+
+static bool
+shine_encoder_open(Encoder *_encoder, AudioFormat &audio_format, Error &error)
+{
+	ShineEncoder *encoder = (ShineEncoder *)_encoder;
+
+	audio_format.format = SampleFormat::S16;
+	audio_format.channels = CHANNELS;
+	encoder->audio_format = audio_format;
+
+	if (!encoder->Setup(error))
+		return false;
+
+	encoder->stereo[0] = new int16_t[encoder->frame_size];
+	encoder->stereo[1] = new int16_t[encoder->frame_size];
+	/* workaround for bug:
+	   https://github.com/savonet/shine/issues/11 */
+	encoder->input_pos = SHINE_MAX_SAMPLES + 1;
+
+	encoder->output_buffer.Construct(BUFFER_INIT_SIZE);
+
+	return true;
+}
+
+static void
+shine_encoder_close(Encoder *_encoder)
+{
+	ShineEncoder *encoder = (ShineEncoder *)_encoder;
+
+	if (encoder->input_pos > SHINE_MAX_SAMPLES) {
+		/* write zero chunk */
+		encoder->input_pos = 0;
+		encoder->WriteChunk(true);
+	}
+
+	shine_close(encoder->shine);
+	delete[] encoder->stereo[0];
+	delete[] encoder->stereo[1];
+	encoder->output_buffer.Destruct();
+}
+
+bool
+ShineEncoder::WriteChunk(bool flush)
+{
+	if (flush || input_pos == frame_size) {
+		long written;
+
+		if (flush) {
+			/* fill remaining with 0s */
+			for (; input_pos < frame_size; input_pos++) {
+				stereo[0][input_pos] = stereo[1][input_pos] = 0;
+			}
+		}
+
+		const uint8_t *out =
+			shine_encode_buffer(shine, stereo, &written);
+
+		if (written > 0)
+			output_buffer->Append(out, written);
+
+		input_pos = 0;
+	}
+
+	return true;
+}
+
+static bool
+shine_encoder_write(Encoder *_encoder,
+		    const void *_data, size_t length,
+		    gcc_unused Error &error)
+{
+	ShineEncoder *encoder = (ShineEncoder *)_encoder;
+	const int16_t *data = (const int16_t*)_data;
+	length /= sizeof(*data) * encoder->audio_format.channels;
+	size_t written = 0;
+
+	if (encoder->input_pos > SHINE_MAX_SAMPLES) {
+		encoder->input_pos = 0;
+	}
+
+	/* write all data to de-interleaved buffers */
+	while (written < length) {
+		for (;
+		     written < length
+			     && encoder->input_pos < encoder->frame_size;
+		     written++, encoder->input_pos++) {
+			const size_t base =
+				written * encoder->audio_format.channels;
+			encoder->stereo[0][encoder->input_pos] = data[base];
+			encoder->stereo[1][encoder->input_pos] = data[base + 1];
+		}
+		/* write if chunk is filled */
+		encoder->WriteChunk(false);
+	}
+
+	return true;
+}
+
+static bool
+shine_encoder_flush(Encoder *_encoder, gcc_unused Error &error)
+{
+	ShineEncoder *encoder = (ShineEncoder *)_encoder;
+	long written;
+
+	/* flush buffers and flush shine */
+	encoder->WriteChunk(true);
+	const uint8_t *data = shine_flush(encoder->shine, &written);
+
+	if (written > 0)
+		encoder->output_buffer->Append(data, written);
+
+	return true;
+}
+
+static size_t
+shine_encoder_read(Encoder *_encoder, void *dest, size_t length)
+{
+	ShineEncoder *encoder = (ShineEncoder *)_encoder;
+
+	return encoder->output_buffer->Read((uint8_t *)dest, length);
+}
+
+static const char *
+shine_encoder_get_mime_type(gcc_unused Encoder *_encoder)
+{
+	return "audio/mpeg";
+}
+
+const EncoderPlugin shine_encoder_plugin = {
+	"shine",
+	shine_encoder_init,
+	shine_encoder_finish,
+	shine_encoder_open,
+	shine_encoder_close,
+	shine_encoder_flush,
+	shine_encoder_flush,
+	nullptr,
+	nullptr,
+	shine_encoder_write,
+	shine_encoder_read,
+	shine_encoder_get_mime_type,
+};
diff --git a/src/encoder/plugins/ShineEncoderPlugin.hxx b/src/encoder/plugins/ShineEncoderPlugin.hxx
new file mode 100644
index 000000000..8b1520a74
--- /dev/null
+++ b/src/encoder/plugins/ShineEncoderPlugin.hxx
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2003-2014 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_ENCODER_SHINE_HXX
+#define MPD_ENCODER_SHINE_HXX
+
+extern const struct EncoderPlugin shine_encoder_plugin;
+
+#endif
diff --git a/src/encoder/TwolameEncoderPlugin.cxx b/src/encoder/plugins/TwolameEncoderPlugin.cxx
index 543e71d64..2eb6b2b1c 100644
--- a/src/encoder/TwolameEncoderPlugin.cxx
+++ b/src/encoder/plugins/TwolameEncoderPlugin.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
 
 #include "config.h"
 #include "TwolameEncoderPlugin.hxx"
-#include "EncoderAPI.hxx"
+#include "../EncoderAPI.hxx"
 #include "AudioFormat.hxx"
-#include "ConfigError.hxx"
+#include "config/ConfigError.hxx"
 #include "util/NumberParser.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
diff --git a/src/encoder/TwolameEncoderPlugin.hxx b/src/encoder/plugins/TwolameEncoderPlugin.hxx
index dd8a536f6..531dd3e90 100644
--- a/src/encoder/TwolameEncoderPlugin.hxx
+++ b/src/encoder/plugins/TwolameEncoderPlugin.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/encoder/VorbisEncoderPlugin.cxx b/src/encoder/plugins/VorbisEncoderPlugin.cxx
index 5b40aaea1..7fdb3066f 100644
--- a/src/encoder/VorbisEncoderPlugin.cxx
+++ b/src/encoder/plugins/VorbisEncoderPlugin.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,10 +21,10 @@
 #include "VorbisEncoderPlugin.hxx"
 #include "OggStream.hxx"
 #include "OggSerial.hxx"
-#include "EncoderAPI.hxx"
+#include "../EncoderAPI.hxx"
 #include "tag/Tag.hxx"
 #include "AudioFormat.hxx"
-#include "ConfigError.hxx"
+#include "config/ConfigError.hxx"
 #include "util/NumberParser.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
@@ -33,8 +33,6 @@
 
 #include <glib.h>
 
-#include <assert.h>
-
 struct vorbis_encoder {
 	/** the base class */
 	Encoder encoder;
diff --git a/src/encoder/VorbisEncoderPlugin.hxx b/src/encoder/plugins/VorbisEncoderPlugin.hxx
index d5d6125d2..80703bf88 100644
--- a/src/encoder/VorbisEncoderPlugin.hxx
+++ b/src/encoder/plugins/VorbisEncoderPlugin.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/src/encoder/WaveEncoderPlugin.cxx b/src/encoder/plugins/WaveEncoderPlugin.cxx
index acae0be9e..97a26e821 100644
--- a/src/encoder/WaveEncoderPlugin.cxx
+++ b/src/encoder/plugins/WaveEncoderPlugin.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,12 +19,10 @@
 
 #include "config.h"
 #include "WaveEncoderPlugin.hxx"
-#include "EncoderAPI.hxx"
+#include "../EncoderAPI.hxx"
 #include "system/ByteOrder.hxx"
-#include "util/fifo_buffer.h"
-extern "C" {
-#include "util/growing_fifo.h"
-}
+#include "util/Manual.hxx"
+#include "util/DynamicFifoBuffer.hxx"
 
 #include <assert.h>
 #include <string.h>
@@ -33,7 +31,7 @@ struct WaveEncoder {
 	Encoder encoder;
 	unsigned bits;
 
-	struct fifo_buffer *buffer;
+	Manual<DynamicFifoBuffer<uint8_t>> buffer;
 
 	WaveEncoder():encoder(wave_encoder_plugin) {}
 };
@@ -128,9 +126,11 @@ wave_encoder_open(Encoder *_encoder,
 		break;
 	}
 
-	encoder->buffer = growing_fifo_new();
-	wave_header *header = (wave_header *)
-		growing_fifo_write(&encoder->buffer, sizeof(*header));
+	encoder->buffer.Construct(8192);
+
+	auto range = encoder->buffer->Write();
+	assert(range.size >= sizeof(wave_header));
+	wave_header *header = (wave_header *)range.data;
 
 	/* create PCM wave header in initial buffer */
 	fill_wave_header(header,
@@ -138,7 +138,8 @@ wave_encoder_open(Encoder *_encoder,
 			 encoder->bits,
 			 audio_format.sample_rate,
 			 (encoder->bits / 8) * audio_format.channels);
-	fifo_buffer_append(encoder->buffer, sizeof(*header));
+
+	encoder->buffer->Append(sizeof(*header));
 
 	return true;
 }
@@ -148,7 +149,7 @@ wave_encoder_close(Encoder *_encoder)
 {
 	WaveEncoder *encoder = (WaveEncoder *)_encoder;
 
-	fifo_buffer_free(encoder->buffer);
+	encoder->buffer.Destruct();
 }
 
 static size_t
@@ -198,7 +199,7 @@ wave_encoder_write(Encoder *_encoder,
 {
 	WaveEncoder *encoder = (WaveEncoder *)_encoder;
 
-	uint8_t *dst = (uint8_t *)growing_fifo_write(&encoder->buffer, length);
+	uint8_t *dst = encoder->buffer->Write(length);
 
 	if (IsLittleEndian()) {
 		switch (encoder->bits) {
@@ -230,7 +231,7 @@ wave_encoder_write(Encoder *_encoder,
 		}
 	}
 
-	fifo_buffer_append(encoder->buffer, length);
+	encoder->buffer->Append(length);
 	return true;
 }
 
@@ -239,17 +240,7 @@ wave_encoder_read(Encoder *_encoder, void *dest, size_t length)
 {
 	WaveEncoder *encoder = (WaveEncoder *)_encoder;
 
-	size_t max_length;
-	const void *src = fifo_buffer_read(encoder->buffer, &max_length);
-	if (src == NULL)
-		return 0;
-
-	if (length > max_length)
-		length = max_length;
-
-	memcpy(dest, src, length);
-	fifo_buffer_consume(encoder->buffer, length);
-	return length;
+	return encoder->buffer->Read((uint8_t *)dest, length);
 }
 
 static const char *
diff --git a/src/encoder/WaveEncoderPlugin.hxx b/src/encoder/plugins/WaveEncoderPlugin.hxx
index 190ee131e..341b98adc 100644
--- a/src/encoder/WaveEncoderPlugin.hxx
+++ b/src/encoder/plugins/WaveEncoderPlugin.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify