12 files changed, 800 insertions, 88 deletions

diff --git a/src/input/AlsaInputPlugin.cxx b/src/input/AlsaInputPlugin.cxx
new file mode 100644
index 000000000..9990091d3
--- /dev/null
+++ b/src/input/AlsaInputPlugin.cxx
@@ -0,0 +1,431 @@
+/*
+ * Copyright (C) 2003-2013 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.
+ */
+
+/*
+ * ALSA code based on an example by Paul Davis released under GPL here:
+ * http://equalarea.com/paul/alsa-audio.html
+ * and one by Matthias Nagorni, also GPL, here:
+ * http://alsamodular.sourceforge.net/alsa_programming_howto.html
+ */
+
+#include "config.h"
+#include "AlsaInputPlugin.hxx"
+#include "InputPlugin.hxx"
+#include "InputStream.hxx"
+#include "util/Domain.hxx"
+#include "util/Error.hxx"
+#include "util/StringUtil.hxx"
+#include "util/ReusableArray.hxx"
+#include "util/Cast.hxx"
+#include "Log.hxx"
+#include "event/MultiSocketMonitor.hxx"
+#include "event/DeferredMonitor.hxx"
+#include "event/Call.hxx"
+#include "thread/Mutex.hxx"
+#include "thread/Cond.hxx"
+#include "IOThread.hxx"
+
+#include <alsa/asoundlib.h>
+
+#include <assert.h>
+#include <string.h>
+
+static constexpr Domain alsa_input_domain("alsa");
+
+static constexpr const char *default_device = "hw:0,0";
+
+// the following defaults are because the PcmDecoderPlugin forces CD format
+static constexpr snd_pcm_format_t default_format = SND_PCM_FORMAT_S16;
+static constexpr int default_channels = 2; // stereo
+static constexpr unsigned int default_rate = 44100; // cd quality
+
+/**
+ * This value should be the same as the read buffer size defined in
+ * PcmDecoderPlugin.cxx:pcm_stream_decode().
+ * We use it to calculate how many audio frames to buffer in the alsa driver
+ * before reading from the device. snd_pcm_readi() blocks until that many
+ * frames are ready.
+ */
+static constexpr size_t read_buffer_size = 4096;
+
+class AlsaInputStream final : MultiSocketMonitor, DeferredMonitor {
+	InputStream base;
+	snd_pcm_t *capture_handle;
+	size_t frame_size;
+	int frames_to_read;
+	bool eof;
+
+	/**
+	 * Is somebody waiting for data?  This is set by method
+	 * Available().
+	 */
+	std::atomic_bool waiting;
+
+	ReusableArray<pollfd> pfd_buffer;
+
+public:
+	AlsaInputStream(EventLoop &loop,
+			const char *uri, Mutex &mutex, Cond &cond,
+			snd_pcm_t *_handle, int _frame_size)
+		:MultiSocketMonitor(loop),
+		 DeferredMonitor(loop),
+		 base(input_plugin_alsa, uri, mutex, cond),
+		 capture_handle(_handle),
+		 frame_size(_frame_size),
+		 eof(false)
+	{
+		assert(uri != nullptr);
+		assert(_handle != nullptr);
+
+		/* this mime type forces use of the PcmDecoderPlugin.
+		   Needs to be generalised when/if that decoder is
+		   updated to support other audio formats */
+		base.mime = strdup("audio/x-mpd-cdda-pcm");
+		base.seekable = false;
+		base.size = -1;
+		base.ready = true;
+		frames_to_read = read_buffer_size / frame_size;
+
+		snd_pcm_start(capture_handle);
+
+		DeferredMonitor::Schedule();
+	}
+
+	~AlsaInputStream() {
+		snd_pcm_close(capture_handle);
+	}
+
+	using DeferredMonitor::GetEventLoop;
+
+	static InputStream *Create(const char *uri, Mutex &mutex, Cond &cond,
+				   Error &error);
+
+#if GCC_CHECK_VERSION(4,6) || defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Winvalid-offsetof"
+#endif
+
+	static constexpr AlsaInputStream *Cast(InputStream *is) {
+		return ContainerCast(is, AlsaInputStream, base);
+	}
+
+#if GCC_CHECK_VERSION(4,6) || defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
+
+	bool Available() {
+		if (snd_pcm_avail(capture_handle) > frames_to_read)
+			return true;
+
+		if (!waiting.exchange(true))
+			SafeInvalidateSockets();
+
+		return false;
+	}
+
+	size_t Read(void *ptr, size_t size, Error &error);
+
+	bool IsEOF() {
+		return eof;
+	}
+
+private:
+	static snd_pcm_t *OpenDevice(const char *device, int rate,
+				     snd_pcm_format_t format, int channels,
+				     Error &error);
+
+	int Recover(int err);
+
+	void SafeInvalidateSockets() {
+		DeferredMonitor::Schedule();
+	}
+
+	virtual void RunDeferred() override {
+		InvalidateSockets();
+	}
+
+	virtual int PrepareSockets() override;
+	virtual void DispatchSockets() override;
+};
+
+inline InputStream *
+AlsaInputStream::Create(const char *uri, Mutex &mutex, Cond &cond,
+			Error &error)
+{
+	const char *const scheme = "alsa://";
+	if (!StringStartsWith(uri, scheme))
+		return nullptr;
+
+	const char *device = uri + strlen(scheme);
+	if (strlen(device) == 0)
+		device = default_device;
+
+	/* placeholders - eventually user-requested audio format will
+	   be passed via the URI. For now we just force the
+	   defaults */
+	int rate = default_rate;
+	snd_pcm_format_t format = default_format;
+	int channels = default_channels;
+
+	snd_pcm_t *handle = OpenDevice(device, rate, format, channels,
+				       error);
+	if (handle == nullptr)
+		return nullptr;
+
+	int frame_size = snd_pcm_format_width(format) / 8 * channels;
+	AlsaInputStream *stream = new AlsaInputStream(io_thread_get(),
+						      uri, mutex, cond,
+						      handle, frame_size);
+	return &stream->base;
+}
+
+inline size_t
+AlsaInputStream::Read(void *ptr, size_t size, Error &error)
+{
+	assert(ptr != nullptr);
+
+	int num_frames = size / frame_size;
+	int ret;
+	while ((ret = snd_pcm_readi(capture_handle, ptr, num_frames)) < 0) {
+		if (Recover(ret) < 0) {
+			eof = true;
+			error.Format(alsa_input_domain,
+				     "PCM error - stream aborted");
+			return 0;
+		}
+	}
+
+	size_t nbytes = ret * frame_size;
+	base.offset += nbytes;
+	return nbytes;
+}
+
+int
+AlsaInputStream::PrepareSockets()
+{
+	if (!waiting) {
+		ClearSocketList();
+		return -1;
+	}
+
+	int count = snd_pcm_poll_descriptors_count(capture_handle);
+	if (count < 0) {
+		ClearSocketList();
+		return -1;
+	}
+
+	struct pollfd *pfds = pfd_buffer.Get(count);
+
+	count = snd_pcm_poll_descriptors(capture_handle, pfds, count);
+	if (count < 0)
+		count = 0;
+
+	ReplaceSocketList(pfds, count);
+	return -1;
+}
+
+void
+AlsaInputStream::DispatchSockets()
+{
+	waiting = false;
+
+	const ScopeLock protect(base.mutex);
+	/* wake up the thread that is waiting for more data */
+	base.cond.broadcast();
+}
+
+inline int
+AlsaInputStream::Recover(int err)
+{
+	switch(err) {
+	case -EPIPE:
+		LogDebug(alsa_input_domain, "Buffer Overrun");
+		// drop through
+	case -ESTRPIPE:
+	case -EINTR:
+		err = snd_pcm_recover(capture_handle, err, 1);
+		break;
+	default:
+		// something broken somewhere, give up
+		err = -1;
+	}
+	return err;
+}
+
+inline snd_pcm_t *
+AlsaInputStream::OpenDevice(const char *device,
+			    int rate, snd_pcm_format_t format, int channels,
+			    Error &error)
+{
+	snd_pcm_t *capture_handle;
+	int err;
+	if ((err = snd_pcm_open(&capture_handle, device,
+				SND_PCM_STREAM_CAPTURE, 0)) < 0) {
+		error.Format(alsa_input_domain, "Failed to open device: %s (%s)", device, snd_strerror(err));
+		return nullptr;
+	}
+
+	snd_pcm_hw_params_t *hw_params;
+	if ((err = snd_pcm_hw_params_malloc(&hw_params)) < 0) {
+		error.Format(alsa_input_domain, "Cannot allocate hardware parameter structure (%s)", snd_strerror(err));
+		snd_pcm_close(capture_handle);
+		return nullptr;
+	}
+
+	if ((err = snd_pcm_hw_params_any(capture_handle, hw_params)) < 0) {
+		error.Format(alsa_input_domain, "Cannot initialize hardware parameter structure (%s)", snd_strerror(err));
+		snd_pcm_hw_params_free(hw_params);
+		snd_pcm_close(capture_handle);
+		return nullptr;
+	}
+
+	if ((err = snd_pcm_hw_params_set_access(capture_handle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0) {
+		error.Format(alsa_input_domain, "Cannot set access type (%s)", snd_strerror (err));
+		snd_pcm_hw_params_free(hw_params);
+		snd_pcm_close(capture_handle);
+		return nullptr;
+	}
+
+	if ((err = snd_pcm_hw_params_set_format(capture_handle, hw_params, format)) < 0) {
+		snd_pcm_hw_params_free(hw_params);
+		snd_pcm_close(capture_handle);
+		error.Format(alsa_input_domain, "Cannot set sample format (%s)", snd_strerror (err));
+		return nullptr;
+	}
+
+	if ((err = snd_pcm_hw_params_set_channels(capture_handle, hw_params, channels)) < 0) {
+		snd_pcm_hw_params_free(hw_params);
+		snd_pcm_close(capture_handle);
+		error.Format(alsa_input_domain, "Cannot set channels (%s)", snd_strerror (err));
+		return nullptr;
+	}
+
+	if ((err = snd_pcm_hw_params_set_rate(capture_handle, hw_params, rate, 0)) < 0) {
+		snd_pcm_hw_params_free(hw_params);
+		snd_pcm_close(capture_handle);
+		error.Format(alsa_input_domain, "Cannot set sample rate (%s)", snd_strerror (err));
+		return nullptr;
+	}
+
+	/* period needs to be big enough so that poll() doesn't fire too often,
+	 * but small enough that buffer overruns don't occur if Read() is not
+	 * invoked often enough.
+	 * the calculation here is empirical; however all measurements were
+	 * done using 44100:16:2. When we extend this plugin to support
+	 * other audio formats then this may need to be revisited */
+	snd_pcm_uframes_t period = read_buffer_size * 2;
+	int direction = -1;
+	if ((err = snd_pcm_hw_params_set_period_size_near(capture_handle, hw_params,
+							  &period, &direction)) < 0) {
+		error.Format(alsa_input_domain, "Cannot set period size (%s)",
+			     snd_strerror(err));
+		snd_pcm_hw_params_free(hw_params);
+		snd_pcm_close(capture_handle);
+		return nullptr;
+	}
+
+	if ((err = snd_pcm_hw_params(capture_handle, hw_params)) < 0) {
+		error.Format(alsa_input_domain, "Cannot set parameters (%s)",
+			     snd_strerror(err));
+		snd_pcm_hw_params_free(hw_params);
+		snd_pcm_close(capture_handle);
+		return nullptr;
+	}
+
+	snd_pcm_hw_params_free (hw_params);
+
+	snd_pcm_sw_params_t *sw_params;
+
+	snd_pcm_sw_params_malloc(&sw_params);
+	snd_pcm_sw_params_current(capture_handle, sw_params);
+
+	if ((err = snd_pcm_sw_params_set_start_threshold(capture_handle, sw_params,
+							 period)) < 0)  {
+		error.Format(alsa_input_domain,
+			     "unable to set start threshold (%s)", snd_strerror(err));
+		snd_pcm_sw_params_free(sw_params);
+		snd_pcm_close(capture_handle);
+		return nullptr;
+	}
+
+	if ((err = snd_pcm_sw_params(capture_handle, sw_params)) < 0) {
+		error.Format(alsa_input_domain,
+			     "unable to install sw params (%s)", snd_strerror(err));
+		snd_pcm_sw_params_free(sw_params);
+		snd_pcm_close(capture_handle);
+		return nullptr;
+	}
+
+	snd_pcm_sw_params_free(sw_params);
+
+	snd_pcm_prepare(capture_handle);
+
+	return capture_handle;
+}
+
+/*#########################  Plugin Functions  ##############################*/
+
+static InputStream *
+alsa_input_open(const char *uri, Mutex &mutex, Cond &cond, Error &error)
+{
+	return AlsaInputStream::Create(uri, mutex, cond, error);
+}
+
+static void
+alsa_input_close(InputStream *is)
+{
+	AlsaInputStream *ais = AlsaInputStream::Cast(is);
+	delete ais;
+}
+
+static bool
+alsa_input_available(InputStream *is)
+{
+	AlsaInputStream *ais = AlsaInputStream::Cast(is);
+	return ais->Available();
+}
+
+static size_t
+alsa_input_read(InputStream *is, void *ptr, size_t size, Error &error)
+{
+	AlsaInputStream *ais = AlsaInputStream::Cast(is);
+	return ais->Read(ptr, size, error);
+}
+
+static bool
+alsa_input_eof(gcc_unused InputStream *is)
+{
+	AlsaInputStream *ais = AlsaInputStream::Cast(is);
+	return ais->IsEOF();
+}
+
+const struct InputPlugin input_plugin_alsa = {
+	"alsa",
+	nullptr,
+	nullptr,
+	alsa_input_open,
+	alsa_input_close,
+	nullptr,
+	nullptr,
+	nullptr,
+	alsa_input_available,
+	alsa_input_read,
+	alsa_input_eof,
+	nullptr,
+};
diff --git a/src/input/AlsaInputPlugin.hxx b/src/input/AlsaInputPlugin.hxx
new file mode 100644
index 000000000..ac9519588
--- /dev/null
+++ b/src/input/AlsaInputPlugin.hxx
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2003-2013 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_ALSA_INPUT_PLUGIN_HXX
+#define MPD_ALSA_INPUT_PLUGIN_HXX
+
+#include "InputPlugin.hxx"
+
+extern const struct InputPlugin input_plugin_alsa;
+
+
+#endif
diff --git a/src/input/ArchiveInputPlugin.cxx b/src/input/ArchiveInputPlugin.cxx
index 5288f2b3b..597a91604 100644
--- a/src/input/ArchiveInputPlugin.cxx
+++ b/src/input/ArchiveInputPlugin.cxx
@@ -25,11 +25,11 @@
 #include "ArchivePlugin.hxx"
 #include "ArchiveFile.hxx"
 #include "InputPlugin.hxx"
-#include "util/Error.hxx"
 #include "fs/Traits.hxx"
+#include "util/Alloc.hxx"
 #include "Log.hxx"
 
-#include <glib.h>
+#include <stdlib.h>
 
 /**
  * select correct archive plugin to handle the input stream
@@ -47,16 +47,16 @@ input_archive_open(const char *pathname,
 	const struct archive_plugin *arplug;
 	InputStream *is;
 
-	if (!PathTraits::IsAbsoluteFS(pathname))
+	if (!PathTraitsFS::IsAbsolute(pathname))
 		return nullptr;
 
-	char *pname = g_strdup(pathname);
+	char *pname = strdup(pathname);
 	// archive_lookup will modify pname when true is returned
 	const char *archive, *filename, *suffix;
 	if (!archive_lookup(pname, &archive, &filename, &suffix)) {
 		FormatDebug(archive_domain,
 			    "not an archive, lookup %s failed", pname);
-		g_free(pname);
+		free(pname);
 		return nullptr;
 	}
 
@@ -65,19 +65,19 @@ input_archive_open(const char *pathname,
 	if (!arplug) {
 		FormatWarning(archive_domain,
 			      "can't handle archive %s", archive);
-		g_free(pname);
+		free(pname);
 		return nullptr;
 	}
 
 	auto file = archive_file_open(arplug, archive, error);
 	if (file == nullptr) {
-		g_free(pname);
+		free(pname);
 		return nullptr;
 	}
 
 	//setup fileops
 	is = file->OpenStream(filename, mutex, cond, error);
-	g_free(pname);
+	free(pname);
 	file->Close();
 
 	return is;
diff --git a/src/input/CdioParanoiaInputPlugin.cxx b/src/input/CdioParanoiaInputPlugin.cxx
index b3ac57413..bf1c3c908 100644
--- a/src/input/CdioParanoiaInputPlugin.cxx
+++ b/src/input/CdioParanoiaInputPlugin.cxx
@@ -25,6 +25,7 @@
 #include "CdioParanoiaInputPlugin.hxx"
 #include "InputStream.hxx"
 #include "InputPlugin.hxx"
+#include "util/StringUtil.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 #include "system/ByteOrder.hxx"
@@ -122,7 +123,7 @@ struct cdio_uri {
 static bool
 parse_cdio_uri(struct cdio_uri *dest, const char *src, Error &error)
 {
-	if (!g_str_has_prefix(src, "cdda://"))
+	if (!StringStartsWith(src, "cdda://"))
 		return false;
 
 	src += 7;
diff --git a/src/input/CurlInputPlugin.cxx b/src/input/CurlInputPlugin.cxx
index b78545951..b74dc12a9 100644
--- a/src/input/CurlInputPlugin.cxx
+++ b/src/input/CurlInputPlugin.cxx
@@ -24,6 +24,7 @@
 #include "ConfigGlobal.hxx"
 #include "ConfigData.hxx"
 #include "tag/Tag.hxx"
+#include "tag/TagBuilder.hxx"
 #include "IcyMetaDataParser.hxx"
 #include "event/SocketMonitor.hxx"
 #include "event/TimeoutMonitor.hxx"
@@ -199,8 +200,6 @@ public:
 		   Abandon() would be most appropriate, but it breaks
 		   the second case - is that a CURL bug?  is there a
 		   better solution? */
-
-		Steal();
 	}
 
 	/**
@@ -780,8 +779,11 @@ copy_icy_tag(struct input_curl *c)
 
 	delete c->tag;
 
-	if (!c->meta_name.empty() && !tag->HasType(TAG_NAME))
-		tag->AddItem(TAG_NAME, c->meta_name.c_str());
+	if (!c->meta_name.empty() && !tag->HasType(TAG_NAME)) {
+		TagBuilder tag_builder(std::move(*tag));
+		tag_builder.AddItem(TAG_NAME, c->meta_name.c_str());
+		*tag = tag_builder.Commit();
+	}
 
 	c->tag = tag;
 }
@@ -910,8 +912,10 @@ input_curl_headerfunction(void *ptr, size_t size, size_t nmemb, void *stream)
 
 		delete c->tag;
 
-		c->tag = new Tag();
-		c->tag->AddItem(TAG_NAME, c->meta_name.c_str());
+		TagBuilder tag_builder;
+		tag_builder.AddItem(TAG_NAME, c->meta_name.c_str());
+
+		c->tag = tag_builder.CommitNew();
 	} else if (StringEqualsCaseASCII(name, "icy-metaint")) {
 		char buffer[64];
 		size_t icy_metaint;
diff --git a/src/input/DespotifyInputPlugin.cxx b/src/input/DespotifyInputPlugin.cxx
index b08299516..18704bd40 100644
--- a/src/input/DespotifyInputPlugin.cxx
+++ b/src/input/DespotifyInputPlugin.cxx
@@ -23,26 +23,25 @@
 #include "InputStream.hxx"
 #include "InputPlugin.hxx"
 #include "tag/Tag.hxx"
+#include "util/StringUtil.hxx"
 #include "Log.hxx"
 
 extern "C" {
 #include <despotify.h>
 }
 
-#include <glib.h>
-
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
 
 #include <stdio.h>
 
-struct DespotifyInputStream {
+class DespotifyInputStream {
 	InputStream base;
 
 	struct despotify_session *session;
 	struct ds_track *track;
-	Tag *tag;
+	Tag tag;
 	struct ds_pcm_data pcm;
 	size_t len_available;
 	bool eof;
@@ -53,7 +52,7 @@ struct DespotifyInputStream {
 			     ds_track *_track)
 		:base(input_plugin_despotify, uri, mutex, cond),
 		 session(_session), track(_track),
-		 tag(mpd_despotify_tag_from_track(track)),
+		 tag(mpd_despotify_tag_from_track(*track)),
 		 len_available(0), eof(false) {
 
 		memset(&pcm, 0, sizeof(pcm));
@@ -63,30 +62,53 @@ struct DespotifyInputStream {
 		base.ready = true;
 	}
 
+public:
 	~DespotifyInputStream() {
-		delete tag;
-
 		despotify_free_track(track);
 	}
+
+	static InputStream *Open(const char *url, Mutex &mutex, Cond &cond,
+				 Error &error);
+
+	bool IsEOF() const {
+		return eof;
+	}
+
+	size_t Read(void *ptr, size_t size, Error &error);
+
+	Tag *ReadTag() {
+		if (tag.IsEmpty())
+			return nullptr;
+
+		Tag *result = new Tag(std::move(tag));
+		tag.Clear();
+		return result;
+	}
+
+	void Callback(int sig);
+
+private:
+	void FillBuffer();
 };
 
-static void
-refill_buffer(DespotifyInputStream *ctx)
+inline void
+DespotifyInputStream::FillBuffer()
 {
 	/* Wait until there is data */
 	while (1) {
-		int rc = despotify_get_pcm(ctx->session, &ctx->pcm);
+		int rc = despotify_get_pcm(session, &pcm);
 
-		if (rc == 0 && ctx->pcm.len) {
-			ctx->len_available = ctx->pcm.len;
+		if (rc == 0 && pcm.len) {
+			len_available = pcm.len;
 			break;
 		}
-		if (ctx->eof == true)
+
+		if (eof == true)
 			break;
 
 		if (rc < 0) {
 			LogDebug(despotify_domain, "despotify_get_pcm error");
-			ctx->eof = true;
+			eof = true;
 			break;
 		}
 
@@ -95,11 +117,9 @@ refill_buffer(DespotifyInputStream *ctx)
 	}
 }
 
-static void callback(gcc_unused struct despotify_session* ds,
-		     int sig, gcc_unused void* data, void* callback_data)
+inline void
+DespotifyInputStream::Callback(int sig)
 {
-	DespotifyInputStream *ctx = (DespotifyInputStream *)callback_data;
-
 	switch (sig) {
 	case DESPOTIFY_NEW_TRACK:
 		break;
@@ -109,35 +129,38 @@ static void callback(gcc_unused struct despotify_session* ds,
 
 	case DESPOTIFY_TRACK_PLAY_ERROR:
 		LogWarning(despotify_domain, "Track play error");
-		ctx->eof = true;
-		ctx->len_available = 0;
+		eof = true;
+		len_available = 0;
 		break;
 
 	case DESPOTIFY_END_OF_PLAYLIST:
-		ctx->eof = true;
-		FormatDebug(despotify_domain, "End of playlist: %d", ctx->eof);
+		eof = true;
+		LogDebug(despotify_domain, "End of playlist");
 		break;
 	}
 }
 
-
-static InputStream *
-input_despotify_open(const char *url,
-		     Mutex &mutex, Cond &cond,
-		     gcc_unused Error &error)
+static void callback(gcc_unused struct despotify_session* ds,
+		     int sig, gcc_unused void* data, void* callback_data)
 {
-	struct despotify_session *session;
-	struct ds_link *ds_link;
-	struct ds_track *track;
+	DespotifyInputStream *ctx = (DespotifyInputStream *)callback_data;
 
-	if (!g_str_has_prefix(url, "spt://"))
+	ctx->Callback(sig);
+}
+
+inline InputStream *
+DespotifyInputStream::Open(const char *url,
+			   Mutex &mutex, Cond &cond,
+			   gcc_unused Error &error)
+{
+	if (!StringStartsWith(url, "spt://"))
 		return nullptr;
 
-	session = mpd_despotify_get_session();
-	if (!session)
+	despotify_session *session = mpd_despotify_get_session();
+	if (session == nullptr)
 		return nullptr;
 
-	ds_link = despotify_link_from_uri(url + 6);
+	ds_link *ds_link = despotify_link_from_uri(url + 6);
 	if (!ds_link) {
 		FormatDebug(despotify_domain, "Can't find %s", url);
 		return nullptr;
@@ -147,7 +170,7 @@ input_despotify_open(const char *url,
 		return nullptr;
 	}
 
-	track = despotify_link_get_track(session, ds_link);
+	ds_track *track = despotify_link_get_track(session, ds_link);
 	despotify_free_link(ds_link);
 	if (!track)
 		return nullptr;
@@ -170,26 +193,34 @@ input_despotify_open(const char *url,
 	return &ctx->base;
 }
 
-static size_t
-input_despotify_read(InputStream *is, void *ptr, size_t size,
-		     gcc_unused Error &error)
+static InputStream *
+input_despotify_open(const char *url, Mutex &mutex, Cond &cond, Error &error)
 {
-	DespotifyInputStream *ctx = (DespotifyInputStream *)is;
-	size_t to_cpy = size;
+	return DespotifyInputStream::Open(url, mutex, cond, error);
+}
 
-	if (ctx->len_available == 0)
-		refill_buffer(ctx);
+inline size_t
+DespotifyInputStream::Read(void *ptr, size_t size, gcc_unused Error &error)
+{
+	if (len_available == 0)
+		FillBuffer();
 
-	if (ctx->len_available < size)
-		to_cpy = ctx->len_available;
-	memcpy(ptr, ctx->pcm.buf, to_cpy);
-	ctx->len_available -= to_cpy;
+	size_t to_cpy = std::min(size, len_available);
+	memcpy(ptr, pcm.buf, to_cpy);
+	len_available -= to_cpy;
 
-	is->offset += to_cpy;
+	base.offset += to_cpy;
 
 	return to_cpy;
 }
 
+static size_t
+input_despotify_read(InputStream *is, void *ptr, size_t size, Error &error)
+{
+	DespotifyInputStream *ctx = (DespotifyInputStream *)is;
+	return ctx->Read(ptr, size, error);
+}
+
 static void
 input_despotify_close(InputStream *is)
 {
@@ -204,18 +235,15 @@ input_despotify_eof(InputStream *is)
 {
 	DespotifyInputStream *ctx = (DespotifyInputStream *)is;
 
-	return ctx->eof;
+	return ctx->IsEOF();
 }
 
 static Tag *
 input_despotify_tag(InputStream *is)
 {
 	DespotifyInputStream *ctx = (DespotifyInputStream *)is;
-	Tag *tag = ctx->tag;
-
-	ctx->tag = nullptr;
 
-	return tag;
+	return ctx->ReadTag();
 }
 
 const InputPlugin input_plugin_despotify = {
diff --git a/src/input/FfmpegInputPlugin.cxx b/src/input/FfmpegInputPlugin.cxx
index 8f9cd0b86..7d041677b 100644
--- a/src/input/FfmpegInputPlugin.cxx
+++ b/src/input/FfmpegInputPlugin.cxx
@@ -24,17 +24,15 @@
 #include "FfmpegInputPlugin.hxx"
 #include "InputStream.hxx"
 #include "InputPlugin.hxx"
+#include "util/StringUtil.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 
 extern "C" {
-#include <libavutil/avutil.h>
 #include <libavformat/avio.h>
 #include <libavformat/avformat.h>
 }
 
-#include <glib.h>
-
 struct FfmpegInputStream {
 	InputStream base;
 
@@ -91,12 +89,12 @@ input_ffmpeg_open(const char *uri,
 		  Mutex &mutex, Cond &cond,
 		  Error &error)
 {
-	if (!g_str_has_prefix(uri, "gopher://") &&
-	    !g_str_has_prefix(uri, "rtp://") &&
-	    !g_str_has_prefix(uri, "rtsp://") &&
-	    !g_str_has_prefix(uri, "rtmp://") &&
-	    !g_str_has_prefix(uri, "rtmpt://") &&
-	    !g_str_has_prefix(uri, "rtmps://"))
+	if (!StringStartsWith(uri, "gopher://") &&
+	    !StringStartsWith(uri, "rtp://") &&
+	    !StringStartsWith(uri, "rtsp://") &&
+	    !StringStartsWith(uri, "rtmp://") &&
+	    !StringStartsWith(uri, "rtmpt://") &&
+	    !StringStartsWith(uri, "rtmps://"))
 		return nullptr;
 
 	AVIOContext *h;
diff --git a/src/input/FileInputPlugin.cxx b/src/input/FileInputPlugin.cxx
index 26e40d609..5a63a469c 100644
--- a/src/input/FileInputPlugin.cxx
+++ b/src/input/FileInputPlugin.cxx
@@ -30,8 +30,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
-#include <string.h>
-#include <glib.h>
 
 static constexpr Domain file_domain("file");
 
@@ -62,7 +60,7 @@ input_file_open(const char *filename,
 	int fd, ret;
 	struct stat st;
 
-	if (!PathTraits::IsAbsoluteFS(filename))
+	if (!PathTraitsFS::IsAbsolute(filename))
 		return nullptr;
 
 	fd = open_cloexec(filename, O_RDONLY|O_BINARY, 0);
diff --git a/src/input/MmsInputPlugin.cxx b/src/input/MmsInputPlugin.cxx
index e97c1eb3f..2c7f6d166 100644
--- a/src/input/MmsInputPlugin.cxx
+++ b/src/input/MmsInputPlugin.cxx
@@ -21,15 +21,12 @@
 #include "MmsInputPlugin.hxx"
 #include "InputStream.hxx"
 #include "InputPlugin.hxx"
+#include "util/StringUtil.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 
-#include <glib.h>
 #include <libmms/mmsx.h>
 
-#include <string.h>
-#include <errno.h>
-
 struct MmsInputStream {
 	InputStream base;
 
@@ -61,10 +58,10 @@ input_mms_open(const char *url,
 	       Mutex &mutex, Cond &cond,
 	       Error &error)
 {
-	if (!g_str_has_prefix(url, "mms://") &&
-	    !g_str_has_prefix(url, "mmsh://") &&
-	    !g_str_has_prefix(url, "mmst://") &&
-	    !g_str_has_prefix(url, "mmsu://"))
+	if (!StringStartsWith(url, "mms://") &&
+	    !StringStartsWith(url, "mmsh://") &&
+	    !StringStartsWith(url, "mmst://") &&
+	    !StringStartsWith(url, "mmsu://"))
 		return nullptr;
 
 	const auto mms = mmsx_connect(nullptr, nullptr, url, 128 * 1024);
diff --git a/src/input/RewindInputPlugin.cxx b/src/input/RewindInputPlugin.cxx
index e11f56631..78ab75660 100644
--- a/src/input/RewindInputPlugin.cxx
+++ b/src/input/RewindInputPlugin.cxx
@@ -21,7 +21,6 @@
 #include "RewindInputPlugin.hxx"
 #include "InputStream.hxx"
 #include "InputPlugin.hxx"
-#include "tag/Tag.hxx"
 
 #include <assert.h>
 #include <string.h>
diff --git a/src/input/SmbclientInputPlugin.cxx b/src/input/SmbclientInputPlugin.cxx
new file mode 100644
index 000000000..f97aff7d5
--- /dev/null
+++ b/src/input/SmbclientInputPlugin.cxx
@@ -0,0 +1,203 @@
+/*
+ * Copyright (C) 2003-2013 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 "SmbclientInputPlugin.hxx"
+#include "InputStream.hxx"
+#include "InputPlugin.hxx"
+#include "util/StringUtil.hxx"
+#include "util/Error.hxx"
+
+#include <libsmbclient.h>
+
+#include <string.h>
+
+class SmbclientInputStream {
+	InputStream base;
+
+	SMBCCTX *ctx;
+	int fd;
+
+public:
+	SmbclientInputStream(const char *uri,
+			     Mutex &mutex, Cond &cond,
+			     SMBCCTX *_ctx, int _fd, const struct stat &st)
+		:base(input_plugin_smbclient, uri, mutex, cond),
+		 ctx(_ctx), fd(_fd) {
+		base.ready = true;
+		base.seekable = true;
+		base.size = st.st_size;
+	}
+
+	~SmbclientInputStream() {
+		smbc_close(fd);
+		smbc_free_context(ctx, 1);
+	}
+
+	InputStream *GetBase() {
+		return &base;
+	}
+
+	bool IsEOF() const {
+		return base.offset >= base.size;
+	}
+
+	size_t Read(void *ptr, size_t size, Error &error) {
+		ssize_t nbytes = smbc_read(fd, ptr, size);
+		if (nbytes < 0) {
+			error.SetErrno("smbc_read() failed");
+			nbytes = 0;
+		}
+
+		return nbytes;
+	}
+
+	bool Seek(InputStream::offset_type offset, int whence, Error &error) {
+		off_t result = smbc_lseek(fd, offset, whence);
+		if (result < 0) {
+			error.SetErrno("smbc_lseek() failed");
+			return false;
+		}
+
+		base.offset = result;
+		return true;
+	}
+};
+
+static void
+mpd_smbc_get_auth_data(gcc_unused const char *srv,
+		       gcc_unused const char *shr,
+		       char *wg, gcc_unused int wglen,
+		       char *un, gcc_unused int unlen,
+		       char *pw, gcc_unused int pwlen)
+{
+	// TODO: implement
+	strcpy(wg, "WORKGROUP");
+	strcpy(un, "foo");
+	strcpy(pw, "bar");
+}
+
+/*
+ * InputPlugin methods
+ *
+ */
+
+static bool
+input_smbclient_init(gcc_unused const config_param &param, Error &error)
+{
+	constexpr int debug = 0;
+	if (smbc_init(mpd_smbc_get_auth_data, debug) < 0) {
+		error.SetErrno("smbc_init() failed");
+		return false;
+	}
+
+	// TODO: create one global SMBCCTX here?
+
+	// TODO: evaluate config_param, call smbc_setOption*()
+
+	return true;
+}
+
+static InputStream *
+input_smbclient_open(const char *uri,
+		     Mutex &mutex, Cond &cond,
+		     Error &error)
+{
+	if (!StringStartsWith(uri, "smb://"))
+		return nullptr;
+
+	SMBCCTX *ctx = smbc_new_context();
+	if (ctx == nullptr) {
+		error.SetErrno("smbc_new_context() failed");
+		return nullptr;
+	}
+
+	SMBCCTX *ctx2 = smbc_init_context(ctx);
+	if (ctx2 == nullptr) {
+		error.SetErrno("smbc_init_context() failed");
+		smbc_free_context(ctx, 1);
+		return nullptr;
+	}
+
+	ctx = ctx2;
+
+	int fd = smbc_open(uri, O_RDONLY, 0);
+	if (fd < 0) {
+		error.SetErrno("smbc_open() failed");
+		smbc_free_context(ctx, 1);
+		return nullptr;
+	}
+
+	struct stat st;
+	if (smbc_fstat(fd, &st) < 0) {
+		error.SetErrno("smbc_fstat() failed");
+		smbc_close(fd);
+		smbc_free_context(ctx, 1);
+		return nullptr;
+	}
+
+	auto s = new SmbclientInputStream(uri, mutex, cond, ctx, fd, st);
+	return s->GetBase();
+}
+
+static size_t
+input_smbclient_read(InputStream *is, void *ptr, size_t size,
+		     Error &error)
+{
+	SmbclientInputStream &s = *(SmbclientInputStream *)is;
+	return s.Read(ptr, size, error);
+}
+
+static void
+input_smbclient_close(InputStream *is)
+{
+	SmbclientInputStream *s = (SmbclientInputStream *)is;
+	delete s;
+}
+
+static bool
+input_smbclient_eof(InputStream *is)
+{
+	SmbclientInputStream &s = *(SmbclientInputStream *)is;
+	return s.IsEOF();
+}
+
+static bool
+input_smbclient_seek(InputStream *is,
+		     InputPlugin::offset_type offset, int whence,
+		     Error &error)
+{
+	SmbclientInputStream &s = *(SmbclientInputStream *)is;
+	return s.Seek(offset, whence, error);
+}
+
+const InputPlugin input_plugin_smbclient = {
+	"smbclient",
+	input_smbclient_init,
+	nullptr,
+	input_smbclient_open,
+	input_smbclient_close,
+	nullptr,
+	nullptr,
+	nullptr,
+	nullptr,
+	input_smbclient_read,
+	input_smbclient_eof,
+	input_smbclient_seek,
+};
diff --git a/src/input/SmbclientInputPlugin.hxx b/src/input/SmbclientInputPlugin.hxx
new file mode 100644
index 000000000..7203a01b8
--- /dev/null
+++ b/src/input/SmbclientInputPlugin.hxx
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2003-2013 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_INPUT_SMBCLIENT_H
+#define MPD_INPUT_SMBCLIENT_H
+
+extern const struct InputPlugin input_plugin_smbclient;
+
+#endif