1 files changed, 352 insertions, 376 deletions

diff --git a/src/output/plugins/JackOutputPlugin.cxx b/src/output/plugins/JackOutputPlugin.cxx
index e1dad7893..23843ab5e 100644
--- a/src/output/plugins/JackOutputPlugin.cxx
+++ b/src/output/plugins/JackOutputPlugin.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,26 +20,27 @@
 #include "config.h"
 #include "JackOutputPlugin.hxx"
 #include "../OutputAPI.hxx"
+#include "../Wrapper.hxx"
 #include "config/ConfigError.hxx"
+#include "util/ConstBuffer.hxx"
+#include "util/SplitString.hxx"
 #include "util/Error.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"
 
 #include <assert.h>
 
-#include <glib.h>
 #include <jack/jack.h>
 #include <jack/types.h>
 #include <jack/ringbuffer.h>
 
+#include <unistd.h> /* for usleep() */
 #include <stdlib.h>
 #include <string.h>
 
-enum {
-	MAX_PORTS = 16,
-};
+static constexpr unsigned MAX_PORTS = 16;
 
-static const size_t jack_sample_size = sizeof(jack_default_audio_sample_t);
+static constexpr size_t jack_sample_size = sizeof(jack_default_audio_sample_t);
 
 struct JackOutput {
 	AudioOutput base;
@@ -55,10 +56,10 @@ struct JackOutput {
 
 	/* configuration */
 
-	char *source_ports[MAX_PORTS];
+	std::string source_ports[MAX_PORTS];
 	unsigned num_source_ports;
 
-	char *destination_ports[MAX_PORTS];
+	std::string destination_ports[MAX_PORTS];
 	unsigned num_destination_ports;
 
 	size_t ringbuffer_size;
@@ -82,24 +83,65 @@ struct JackOutput {
 	JackOutput()
 		:base(jack_output_plugin) {}
 
-	bool Initialize(const config_param &param, Error &error_r) {
-		return base.Configure(param, error_r);
+	bool Configure(const ConfigBlock &block, Error &error);
+
+	bool Connect(Error &error);
+
+	/**
+	 * Disconnect the JACK client.
+	 */
+	void Disconnect();
+
+	void Shutdown() {
+		shutdown = true;
+	}
+
+	bool Enable(Error &error);
+	void Disable();
+
+	bool Open(AudioFormat &new_audio_format, Error &error);
+
+	void Close() {
+		Stop();
+	}
+
+	bool Start(Error &error);
+	void Stop();
+
+	/**
+	 * Determine the number of frames guaranteed to be available
+	 * on all channels.
+	 */
+	gcc_pure
+	jack_nframes_t GetAvailable() const;
+
+	void Process(jack_nframes_t nframes);
+
+	/**
+	 * @return the number of frames that were written
+	 */
+	size_t WriteSamples(const float *src, size_t n_frames);
+
+	unsigned Delay() const {
+		return base.pause && pause && !shutdown
+			? 1000
+			: 0;
 	}
+
+	size_t Play(const void *chunk, size_t size, Error &error);
+
+	bool Pause();
 };
 
 static constexpr Domain jack_output_domain("jack_output");
 
-/**
- * Determine the number of frames guaranteed to be available on all
- * channels.
- */
-static jack_nframes_t
-mpd_jack_available(const JackOutput *jd)
+inline jack_nframes_t
+JackOutput::GetAvailable() const
 {
-	size_t min = jack_ringbuffer_read_space(jd->ringbuffer[0]);
+	size_t min = jack_ringbuffer_read_space(ringbuffer[0]);
 
-	for (unsigned i = 1; i < jd->audio_format.channels; ++i) {
-		size_t current = jack_ringbuffer_read_space(jd->ringbuffer[i]);
+	for (unsigned i = 1; i < audio_format.channels; ++i) {
+		size_t current = jack_ringbuffer_read_space(ringbuffer[i]);
 		if (current < min)
 			min = current;
 	}
@@ -109,85 +151,121 @@ mpd_jack_available(const JackOutput *jd)
 	return min / jack_sample_size;
 }
 
-static int
-mpd_jack_process(jack_nframes_t nframes, void *arg)
+/**
+ * Call jack_ringbuffer_read_advance() on all buffers in the list.
+ */
+static void
+MultiReadAdvance(ConstBuffer<jack_ringbuffer_t *> buffers,
+		 size_t size)
 {
-	JackOutput *jd = (JackOutput *) arg;
+	for (auto *i : buffers)
+		jack_ringbuffer_read_advance(i, size);
+}
 
+/**
+ * Write a specific amount of "silence" to the given port.
+ */
+static void
+WriteSilence(jack_port_t &port, jack_nframes_t nframes)
+{
+	jack_default_audio_sample_t *out =
+		(jack_default_audio_sample_t *)
+		jack_port_get_buffer(&port, nframes);
+	if (out == nullptr)
+		/* workaround for libjack1 bug: if the server
+		   connection fails, the process callback is invoked
+		   anyway, but unable to get a buffer */
+			return;
+
+	std::fill_n(out, nframes, 0.0);
+}
+
+/**
+ * Write a specific amount of "silence" to all ports in the list.
+ */
+static void
+MultiWriteSilence(ConstBuffer<jack_port_t *> ports, jack_nframes_t nframes)
+{
+	for (auto *i : ports)
+		WriteSilence(*i, nframes);
+}
+
+/**
+ * Copy data from the buffer to the port.  If the buffer underruns,
+ * fill with silence.
+ */
+static void
+Copy(jack_port_t &dest, jack_nframes_t nframes,
+     jack_ringbuffer_t &src, jack_nframes_t available)
+{
+	jack_default_audio_sample_t *out =
+		(jack_default_audio_sample_t *)
+		jack_port_get_buffer(&dest, nframes);
+	if (out == nullptr)
+		/* workaround for libjack1 bug: if the server
+		   connection fails, the process callback is
+		   invoked anyway, but unable to get a
+		   buffer */
+		return;
+
+	/* copy from buffer to port */
+	jack_ringbuffer_read(&src, (char *)out,
+			     available * jack_sample_size);
+
+	/* ringbuffer underrun, fill with silence */
+	std::fill(out + available, out + nframes, 0.0);
+}
+
+inline void
+JackOutput::Process(jack_nframes_t nframes)
+{
 	if (nframes <= 0)
-		return 0;
+		return;
 
-	if (jd->pause) {
+	jack_nframes_t available = GetAvailable();
+
+	const unsigned n_channels = audio_format.channels;
+
+	if (pause) {
 		/* empty the ring buffers */
 
-		const jack_nframes_t available = mpd_jack_available(jd);
-		for (unsigned i = 0; i < jd->audio_format.channels; ++i)
-			jack_ringbuffer_read_advance(jd->ringbuffer[i],
-						     available * jack_sample_size);
+		MultiReadAdvance({ringbuffer, n_channels},
+				 available * jack_sample_size);
 
 		/* generate silence while MPD is paused */
 
-		for (unsigned i = 0; i < jd->audio_format.channels; ++i) {
-			jack_default_audio_sample_t *out =
-				(jack_default_audio_sample_t *)
-				jack_port_get_buffer(jd->ports[i], nframes);
+		MultiWriteSilence({ports, n_channels}, nframes);
 
-			for (jack_nframes_t f = 0; f < nframes; ++f)
-				out[f] = 0.0;
-		}
-
-		return 0;
+		return;
 	}
 
-	jack_nframes_t available = mpd_jack_available(jd);
 	if (available > nframes)
 		available = nframes;
 
-	for (unsigned i = 0; i < jd->audio_format.channels; ++i) {
-		jack_default_audio_sample_t *out =
-			(jack_default_audio_sample_t *)
-			jack_port_get_buffer(jd->ports[i], nframes);
-		if (out == nullptr)
-			/* workaround for libjack1 bug: if the server
-			   connection fails, the process callback is
-			   invoked anyway, but unable to get a
-			   buffer */
-			continue;
-
-		jack_ringbuffer_read(jd->ringbuffer[i],
-				     (char *)out, available * jack_sample_size);
-
-		for (jack_nframes_t f = available; f < nframes; ++f)
-			/* ringbuffer underrun, fill with silence */
-			out[f] = 0.0;
-	}
+	for (unsigned i = 0; i < n_channels; ++i)
+		Copy(*ports[i], nframes, *ringbuffer[i], available);
 
 	/* generate silence for the unused source ports */
 
-	for (unsigned i = jd->audio_format.channels;
-	     i < jd->num_source_ports; ++i) {
-		jack_default_audio_sample_t *out =
-			(jack_default_audio_sample_t *)
-			jack_port_get_buffer(jd->ports[i], nframes);
-		if (out == nullptr)
-			/* workaround for libjack1 bug: if the server
-			   connection fails, the process callback is
-			   invoked anyway, but unable to get a
-			   buffer */
-			continue;
-
-		for (jack_nframes_t f = 0; f < nframes; ++f)
-			out[f] = 0.0;
-	}
+	MultiWriteSilence({ports + n_channels, num_source_ports - n_channels},
+			  nframes);
+}
+
+static int
+mpd_jack_process(jack_nframes_t nframes, void *arg)
+{
+	JackOutput &jo = *(JackOutput *) arg;
 
+	jo.Process(nframes);
 	return 0;
 }
 
 static void
 mpd_jack_shutdown(void *arg)
 {
-	JackOutput *jd = (JackOutput *) arg;
-	jd->shutdown = true;
+	JackOutput &jo = *(JackOutput *) arg;
+
+	jo.Shutdown();
 }
 
 static void
@@ -200,9 +278,10 @@ set_audioformat(JackOutput *jd, AudioFormat &audio_format)
 	else if (audio_format.channels > jd->num_source_ports)
 		audio_format.channels = 2;
 
-	if (audio_format.format != SampleFormat::S16 &&
-	    audio_format.format != SampleFormat::S24_P32)
-		audio_format.format = SampleFormat::S24_P32;
+	/* JACK uses 32 bit float in the range [-1 .. 1] - just like
+	   MPD's SampleFormat::FLOAT*/
+	static_assert(jack_sample_size == sizeof(float), "Expected float32");
+	audio_format.format = SampleFormat::FLOAT;
 }
 
 static void
@@ -219,55 +298,47 @@ mpd_jack_info(const char *msg)
 }
 #endif
 
-/**
- * Disconnect the JACK client.
- */
-static void
-mpd_jack_disconnect(JackOutput *jd)
+void
+JackOutput::Disconnect()
 {
-	assert(jd != nullptr);
-	assert(jd->client != nullptr);
+	assert(client != nullptr);
 
-	jack_deactivate(jd->client);
-	jack_client_close(jd->client);
-	jd->client = nullptr;
+	jack_deactivate(client);
+	jack_client_close(client);
+	client = nullptr;
 }
 
 /**
  * Connect the JACK client and performs some basic setup
  * (e.g. register callbacks).
  */
-static bool
-mpd_jack_connect(JackOutput *jd, Error &error)
+bool
+JackOutput::Connect(Error &error)
 {
-	jack_status_t status;
-
-	assert(jd != nullptr);
-
-	jd->shutdown = false;
+	shutdown = false;
 
-	jd->client = jack_client_open(jd->name, jd->options, &status,
-				      jd->server_name);
-	if (jd->client == nullptr) {
+	jack_status_t status;
+	client = jack_client_open(name, options, &status, server_name);
+	if (client == nullptr) {
 		error.Format(jack_output_domain, status,
 			     "Failed to connect to JACK server, status=%d",
 			     status);
 		return false;
 	}
 
-	jack_set_process_callback(jd->client, mpd_jack_process, jd);
-	jack_on_shutdown(jd->client, mpd_jack_shutdown, jd);
+	jack_set_process_callback(client, mpd_jack_process, this);
+	jack_on_shutdown(client, mpd_jack_shutdown, this);
 
-	for (unsigned i = 0; i < jd->num_source_ports; ++i) {
-		jd->ports[i] = jack_port_register(jd->client,
-						  jd->source_ports[i],
-						  JACK_DEFAULT_AUDIO_TYPE,
-						  JackPortIsOutput, 0);
-		if (jd->ports[i] == nullptr) {
+	for (unsigned i = 0; i < num_source_ports; ++i) {
+		ports[i] = jack_port_register(client,
+					      source_ports[i].c_str(),
+					      JACK_DEFAULT_AUDIO_TYPE,
+					      JackPortIsOutput, 0);
+		if (ports[i] == nullptr) {
 			error.Format(jack_output_domain,
 				     "Cannot register output port \"%s\"",
-				     jd->source_ports[i]);
-			mpd_jack_disconnect(jd);
+				     source_ports[i].c_str());
+			Disconnect();
 			return false;
 		}
 	}
@@ -282,23 +353,19 @@ mpd_jack_test_default_device(void)
 }
 
 static unsigned
-parse_port_list(const char *source, char **dest, Error &error)
+parse_port_list(const char *source, std::string dest[], Error &error)
 {
-	char **list = g_strsplit(source, ",", 0);
 	unsigned n = 0;
-
-	for (n = 0; list[n] != nullptr; ++n) {
+	for (auto &&i : SplitString(source, ',')) {
 		if (n >= MAX_PORTS) {
 			error.Set(config_domain,
 				  "too many port names");
 			return 0;
 		}
 
-		dest[n] = list[n];
+		dest[n++] = std::move(i);
 	}
 
-	g_free(list);
-
 	if (n == 0) {
 		error.Format(config_domain,
 			     "at least one port name expected");
@@ -308,243 +375,221 @@ parse_port_list(const char *source, char **dest, Error &error)
 	return n;
 }
 
-static AudioOutput *
-mpd_jack_init(const config_param &param, Error &error)
+bool
+JackOutput::Configure(const ConfigBlock &block, Error &error)
 {
-	JackOutput *jd = new JackOutput();
-
-	if (!jd->Initialize(param, error)) {
-		delete jd;
-		return nullptr;
-	}
-
-	const char *value;
+	if (!base.Configure(block, error))
+		return false;
 
-	jd->options = JackNullOption;
+	options = JackNullOption;
 
-	jd->name = param.GetBlockValue("client_name", nullptr);
-	if (jd->name != nullptr)
-		jd->options = jack_options_t(jd->options | JackUseExactName);
+	name = block.GetBlockValue("client_name", nullptr);
+	if (name != nullptr)
+		options = jack_options_t(options | JackUseExactName);
 	else
 		/* if there's a no configured client name, we don't
 		   care about the JackUseExactName option */
-		jd->name = "Music Player Daemon";
+		name = "Music Player Daemon";
 
-	jd->server_name = param.GetBlockValue("server_name", nullptr);
-	if (jd->server_name != nullptr)
-		jd->options = jack_options_t(jd->options | JackServerName);
+	server_name = block.GetBlockValue("server_name", nullptr);
+	if (server_name != nullptr)
+		options = jack_options_t(options | JackServerName);
 
-	if (!param.GetBlockValue("autostart", false))
-		jd->options = jack_options_t(jd->options | JackNoStartServer);
+	if (!block.GetBlockValue("autostart", false))
+		options = jack_options_t(options | JackNoStartServer);
 
 	/* configure the source ports */
 
-	value = param.GetBlockValue("source_ports", "left,right");
-	jd->num_source_ports = parse_port_list(value,
-					       jd->source_ports, error);
-	if (jd->num_source_ports == 0)
-		return nullptr;
+	const char *value = block.GetBlockValue("source_ports", "left,right");
+	num_source_ports = parse_port_list(value, source_ports, error);
+	if (num_source_ports == 0)
+		return false;
 
 	/* configure the destination ports */
 
-	value = param.GetBlockValue("destination_ports", nullptr);
+	value = block.GetBlockValue("destination_ports", nullptr);
 	if (value == nullptr) {
 		/* compatibility with MPD < 0.16 */
-		value = param.GetBlockValue("ports", nullptr);
+		value = block.GetBlockValue("ports", nullptr);
 		if (value != nullptr)
 			FormatWarning(jack_output_domain,
 				      "deprecated option 'ports' in line %d",
-				      param.line);
+				      block.line);
 	}
 
 	if (value != nullptr) {
-		jd->num_destination_ports =
-			parse_port_list(value,
-					jd->destination_ports, error);
-		if (jd->num_destination_ports == 0)
-			return nullptr;
+		num_destination_ports =
+			parse_port_list(value, destination_ports, error);
+		if (num_destination_ports == 0)
+			return false;
 	} else {
-		jd->num_destination_ports = 0;
+		num_destination_ports = 0;
 	}
 
-	if (jd->num_destination_ports > 0 &&
-	    jd->num_destination_ports != jd->num_source_ports)
+	if (num_destination_ports > 0 &&
+	    num_destination_ports != num_source_ports)
 		FormatWarning(jack_output_domain,
 			      "number of source ports (%u) mismatches the "
 			      "number of destination ports (%u) in line %d",
-			      jd->num_source_ports, jd->num_destination_ports,
-			      param.line);
-
-	jd->ringbuffer_size = param.GetBlockValue("ringbuffer_size", 32768u);
+			      num_source_ports, num_destination_ports,
+			      block.line);
 
-	jack_set_error_function(mpd_jack_error);
+	ringbuffer_size = block.GetBlockValue("ringbuffer_size", 32768u);
 
-#ifdef HAVE_JACK_SET_INFO_FUNCTION
-	jack_set_info_function(mpd_jack_info);
-#endif
-
-	return &jd->base;
+	return true;
 }
 
-static void
-mpd_jack_finish(AudioOutput *ao)
+inline bool
+JackOutput::Enable(Error &error)
 {
-	JackOutput *jd = (JackOutput *)ao;
-
-	for (unsigned i = 0; i < jd->num_source_ports; ++i)
-		g_free(jd->source_ports[i]);
+	for (unsigned i = 0; i < num_source_ports; ++i)
+		ringbuffer[i] = nullptr;
 
-	for (unsigned i = 0; i < jd->num_destination_ports; ++i)
-		g_free(jd->destination_ports[i]);
-
-	delete jd;
+	return Connect(error);
 }
 
-static bool
-mpd_jack_enable(AudioOutput *ao, Error &error)
+inline void
+JackOutput::Disable()
 {
-	JackOutput *jd = (JackOutput *)ao;
+	if (client != nullptr)
+		Disconnect();
 
-	for (unsigned i = 0; i < jd->num_source_ports; ++i)
-		jd->ringbuffer[i] = nullptr;
-
-	return mpd_jack_connect(jd, error);
+	for (unsigned i = 0; i < num_source_ports; ++i) {
+		if (ringbuffer[i] != nullptr) {
+			jack_ringbuffer_free(ringbuffer[i]);
+			ringbuffer[i] = nullptr;
+		}
+	}
 }
 
-static void
-mpd_jack_disable(AudioOutput *ao)
+static AudioOutput *
+mpd_jack_init(const ConfigBlock &block, Error &error)
 {
-	JackOutput *jd = (JackOutput *)ao;
-
-	if (jd->client != nullptr)
-		mpd_jack_disconnect(jd);
+	JackOutput *jd = new JackOutput();
 
-	for (unsigned i = 0; i < jd->num_source_ports; ++i) {
-		if (jd->ringbuffer[i] != nullptr) {
-			jack_ringbuffer_free(jd->ringbuffer[i]);
-			jd->ringbuffer[i] = nullptr;
-		}
+	if (!jd->Configure(block, error)) {
+		delete jd;
+		return nullptr;
 	}
+
+	jack_set_error_function(mpd_jack_error);
+
+#ifdef HAVE_JACK_SET_INFO_FUNCTION
+	jack_set_info_function(mpd_jack_info);
+#endif
+
+	return &jd->base;
 }
 
 /**
  * Stops the playback on the JACK connection.
  */
-static void
-mpd_jack_stop(JackOutput *jd)
+void
+JackOutput::Stop()
 {
-	assert(jd != nullptr);
-
-	if (jd->client == nullptr)
+	if (client == nullptr)
 		return;
 
-	if (jd->shutdown)
+	if (shutdown)
 		/* the connection has failed; close it */
-		mpd_jack_disconnect(jd);
+		Disconnect();
 	else
 		/* the connection is alive: just stop playback */
-		jack_deactivate(jd->client);
+		jack_deactivate(client);
 }
 
-static bool
-mpd_jack_start(JackOutput *jd, Error &error)
+inline bool
+JackOutput::Start(Error &error)
 {
-	const char *destination_ports[MAX_PORTS], **jports;
-	const char *duplicate_port = nullptr;
-	unsigned num_destination_ports;
-
-	assert(jd->client != nullptr);
-	assert(jd->audio_format.channels <= jd->num_source_ports);
+	assert(client != nullptr);
+	assert(audio_format.channels <= num_source_ports);
 
 	/* allocate the ring buffers on the first open(); these
 	   persist until MPD exits.  It's too unsafe to delete them
 	   because we can never know when mpd_jack_process() gets
 	   called */
-	for (unsigned i = 0; i < jd->num_source_ports; ++i) {
-		if (jd->ringbuffer[i] == nullptr)
-			jd->ringbuffer[i] =
-				jack_ringbuffer_create(jd->ringbuffer_size);
+	for (unsigned i = 0; i < num_source_ports; ++i) {
+		if (ringbuffer[i] == nullptr)
+			ringbuffer[i] =
+				jack_ringbuffer_create(ringbuffer_size);
 
 		/* clear the ring buffer to be sure that data from
 		   previous playbacks are gone */
-		jack_ringbuffer_reset(jd->ringbuffer[i]);
+		jack_ringbuffer_reset(ringbuffer[i]);
 	}
 
-	if ( jack_activate(jd->client) ) {
+	if ( jack_activate(client) ) {
 		error.Set(jack_output_domain, "cannot activate client");
-		mpd_jack_stop(jd);
+		Stop();
 		return false;
 	}
 
-	if (jd->num_destination_ports == 0) {
+	const char *dports[MAX_PORTS], **jports;
+	unsigned num_dports;
+	if (num_destination_ports == 0) {
 		/* no output ports were configured - ask libjack for
 		   defaults */
-		jports = jack_get_ports(jd->client, nullptr, nullptr,
+		jports = jack_get_ports(client, nullptr, nullptr,
 					JackPortIsPhysical | JackPortIsInput);
 		if (jports == nullptr) {
 			error.Set(jack_output_domain, "no ports found");
-			mpd_jack_stop(jd);
+			Stop();
 			return false;
 		}
 
 		assert(*jports != nullptr);
 
-		for (num_destination_ports = 0;
-		     num_destination_ports < MAX_PORTS &&
-			     jports[num_destination_ports] != nullptr;
-		     ++num_destination_ports) {
+		for (num_dports = 0; num_dports < MAX_PORTS &&
+			     jports[num_dports] != nullptr;
+		     ++num_dports) {
 			FormatDebug(jack_output_domain,
 				    "destination_port[%u] = '%s'\n",
-				    num_destination_ports,
-				    jports[num_destination_ports]);
-			destination_ports[num_destination_ports] =
-				jports[num_destination_ports];
+				    num_dports,
+				    jports[num_dports]);
+			dports[num_dports] = jports[num_dports];
 		}
 	} else {
 		/* use the configured output ports */
 
-		num_destination_ports = jd->num_destination_ports;
-		memcpy(destination_ports, jd->destination_ports,
-		       num_destination_ports * sizeof(*destination_ports));
+		num_dports = num_destination_ports;
+		for (unsigned i = 0; i < num_dports; ++i)
+			dports[i] = destination_ports[i].c_str();
 
 		jports = nullptr;
 	}
 
-	assert(num_destination_ports > 0);
+	assert(num_dports > 0);
 
-	if (jd->audio_format.channels >= 2 && num_destination_ports == 1) {
+	const char *duplicate_port = nullptr;
+	if (audio_format.channels >= 2 && num_dports == 1) {
 		/* mix stereo signal on one speaker */
 
-		while (num_destination_ports < jd->audio_format.channels)
-			destination_ports[num_destination_ports++] =
-				destination_ports[0];
-	} else if (num_destination_ports > jd->audio_format.channels) {
-		if (jd->audio_format.channels == 1 && num_destination_ports > 2) {
+		std::fill(dports + num_dports, dports + audio_format.channels,
+			  dports[0]);
+	} else if (num_dports > audio_format.channels) {
+		if (audio_format.channels == 1 && num_dports > 2) {
 			/* mono input file: connect the one source
 			   channel to the both destination channels */
-			duplicate_port = destination_ports[1];
-			num_destination_ports = 1;
+			duplicate_port = dports[1];
+			num_dports = 1;
 		} else
 			/* connect only as many ports as we need */
-			num_destination_ports = jd->audio_format.channels;
+			num_dports = audio_format.channels;
 	}
 
-	assert(num_destination_ports <= jd->num_source_ports);
-
-	for (unsigned i = 0; i < num_destination_ports; ++i) {
-		int ret;
+	assert(num_dports <= num_source_ports);
 
-		ret = jack_connect(jd->client, jack_port_name(jd->ports[i]),
-				   destination_ports[i]);
+	for (unsigned i = 0; i < num_dports; ++i) {
+		int ret = jack_connect(client, jack_port_name(ports[i]),
+				       dports[i]);
 		if (ret != 0) {
 			error.Format(jack_output_domain,
-				     "Not a valid JACK port: %s",
-				     destination_ports[i]);
+				     "Not a valid JACK port: %s", dports[i]);
 
 			if (jports != nullptr)
 				free(jports);
 
-			mpd_jack_stop(jd);
+			Stop();
 			return false;
 		}
 	}
@@ -554,7 +599,7 @@ mpd_jack_start(JackOutput *jd, Error &error)
 		   the both destination channels */
 		int ret;
 
-		ret = jack_connect(jd->client, jack_port_name(jd->ports[0]),
+		ret = jack_connect(client, jack_port_name(ports[0]),
 				   duplicate_port);
 		if (ret != 0) {
 			error.Format(jack_output_domain,
@@ -564,7 +609,7 @@ mpd_jack_start(JackOutput *jd, Error &error)
 			if (jports != nullptr)
 				free(jports);
 
-			mpd_jack_stop(jd);
+			Stop();
 			return false;
 		}
 	}
@@ -575,188 +620,119 @@ mpd_jack_start(JackOutput *jd, Error &error)
 	return true;
 }
 
-static bool
-mpd_jack_open(AudioOutput *ao, AudioFormat &audio_format,
-	      Error &error)
+inline bool
+JackOutput::Open(AudioFormat &new_audio_format, Error &error)
 {
-	JackOutput *jd = (JackOutput *)ao;
+	pause = false;
 
-	assert(jd != nullptr);
+	if (client != nullptr && shutdown)
+		Disconnect();
 
-	jd->pause = false;
-
-	if (jd->client != nullptr && jd->shutdown)
-		mpd_jack_disconnect(jd);
-
-	if (jd->client == nullptr && !mpd_jack_connect(jd, error))
+	if (client == nullptr && !Connect(error))
 		return false;
 
-	set_audioformat(jd, audio_format);
-	jd->audio_format = audio_format;
+	set_audioformat(this, new_audio_format);
+	audio_format = new_audio_format;
 
-	if (!mpd_jack_start(jd, error))
-		return false;
-
-	return true;
+	return Start(error);
 }
 
-static void
-mpd_jack_close(gcc_unused AudioOutput *ao)
+inline size_t
+JackOutput::WriteSamples(const float *src, size_t n_frames)
 {
-	JackOutput *jd = (JackOutput *)ao;
+	assert(n_frames > 0);
 
-	mpd_jack_stop(jd);
-}
+	const unsigned n_channels = audio_format.channels;
 
-static unsigned
-mpd_jack_delay(AudioOutput *ao)
-{
-	JackOutput *jd = (JackOutput *)ao;
+	float *dest[MAX_CHANNELS];
+	size_t space = -1;
+	for (unsigned i = 0; i < n_channels; ++i) {
+		jack_ringbuffer_data_t d[2];
+		jack_ringbuffer_get_write_vector(ringbuffer[i], d);
 
-	return jd->base.pause && jd->pause && !jd->shutdown
-		? 1000
-		: 0;
-}
+		/* choose the first non-empty writable area */
+		const jack_ringbuffer_data_t &e = d[d[0].len == 0];
 
-static inline jack_default_audio_sample_t
-sample_16_to_jack(int16_t sample)
-{
-	return sample / (jack_default_audio_sample_t)(1 << (16 - 1));
-}
+		if (e.len < space)
+			/* send data symmetrically */
+			space = e.len;
 
-static void
-mpd_jack_write_samples_16(JackOutput *jd, const int16_t *src,
-			  unsigned num_samples)
-{
-	jack_default_audio_sample_t sample;
-	unsigned i;
-
-	while (num_samples-- > 0) {
-		for (i = 0; i < jd->audio_format.channels; ++i) {
-			sample = sample_16_to_jack(*src++);
-			jack_ringbuffer_write(jd->ringbuffer[i],
-					      (const char *)&sample,
-					      sizeof(sample));
-		}
+		dest[i] = (float *)e.buf;
 	}
-}
 
-static inline jack_default_audio_sample_t
-sample_24_to_jack(int32_t sample)
-{
-	return sample / (jack_default_audio_sample_t)(1 << (24 - 1));
-}
+	space /= jack_sample_size;
+	if (space == 0)
+		return 0;
 
-static void
-mpd_jack_write_samples_24(JackOutput *jd, const int32_t *src,
-			  unsigned num_samples)
-{
-	jack_default_audio_sample_t sample;
-	unsigned i;
-
-	while (num_samples-- > 0) {
-		for (i = 0; i < jd->audio_format.channels; ++i) {
-			sample = sample_24_to_jack(*src++);
-			jack_ringbuffer_write(jd->ringbuffer[i],
-					      (const char *)&sample,
-					      sizeof(sample));
-		}
-	}
-}
+	const size_t result = n_frames = std::min(space, n_frames);
 
-static void
-mpd_jack_write_samples(JackOutput *jd, const void *src,
-		       unsigned num_samples)
-{
-	switch (jd->audio_format.format) {
-	case SampleFormat::S16:
-		mpd_jack_write_samples_16(jd, (const int16_t*)src,
-					  num_samples);
-		break;
-
-	case SampleFormat::S24_P32:
-		mpd_jack_write_samples_24(jd, (const int32_t*)src,
-					  num_samples);
-		break;
-
-	default:
-		assert(false);
-		gcc_unreachable();
-	}
+	while (n_frames-- > 0)
+		for (unsigned i = 0; i < n_channels; ++i)
+			*dest[i]++ = *src++;
+
+	const size_t per_channel_advance = result * jack_sample_size;
+	for (unsigned i = 0; i < n_channels; ++i)
+		jack_ringbuffer_write_advance(ringbuffer[i],
+					      per_channel_advance);
+
+	return result;
 }
 
-static size_t
-mpd_jack_play(AudioOutput *ao, const void *chunk, size_t size,
-	      Error &error)
+inline size_t
+JackOutput::Play(const void *chunk, size_t size, Error &error)
 {
-	JackOutput *jd = (JackOutput *)ao;
-	const size_t frame_size = jd->audio_format.GetFrameSize();
-	size_t space = 0, space1;
-
-	jd->pause = false;
+	pause = false;
 
+	const size_t frame_size = audio_format.GetFrameSize();
 	assert(size % frame_size == 0);
 	size /= frame_size;
 
 	while (true) {
-		if (jd->shutdown) {
+		if (shutdown) {
 			error.Set(jack_output_domain,
 				  "Refusing to play, because "
 				  "there is no client thread");
 			return 0;
 		}
 
-		space = jack_ringbuffer_write_space(jd->ringbuffer[0]);
-		for (unsigned i = 1; i < jd->audio_format.channels; ++i) {
-			space1 = jack_ringbuffer_write_space(jd->ringbuffer[i]);
-			if (space > space1)
-				/* send data symmetrically */
-				space = space1;
-		}
-
-		if (space >= jack_sample_size)
-			break;
+		size_t frames_written =
+			WriteSamples((const float *)chunk, size);
+		if (frames_written > 0)
+			return frames_written * frame_size;
 
 		/* XXX do something more intelligent to
 		   synchronize */
-		g_usleep(1000);
+		usleep(1000);
 	}
-
-	space /= jack_sample_size;
-	if (space < size)
-		size = space;
-
-	mpd_jack_write_samples(jd, chunk, size);
-	return size * frame_size;
 }
 
-static bool
-mpd_jack_pause(AudioOutput *ao)
+inline bool
+JackOutput::Pause()
 {
-	JackOutput *jd = (JackOutput *)ao;
-
-	if (jd->shutdown)
+	if (shutdown)
 		return false;
 
-	jd->pause = true;
+	pause = true;
 
 	return true;
 }
 
+typedef AudioOutputWrapper<JackOutput> Wrapper;
+
 const struct AudioOutputPlugin jack_output_plugin = {
 	"jack",
 	mpd_jack_test_default_device,
 	mpd_jack_init,
-	mpd_jack_finish,
-	mpd_jack_enable,
-	mpd_jack_disable,
-	mpd_jack_open,
-	mpd_jack_close,
-	mpd_jack_delay,
+	&Wrapper::Finish,
+	&Wrapper::Enable,
+	&Wrapper::Disable,
+	&Wrapper::Open,
+	&Wrapper::Close,
+	&Wrapper::Delay,
 	nullptr,
-	mpd_jack_play,
+	&Wrapper::Play,
 	nullptr,
 	nullptr,
-	mpd_jack_pause,
+	&Wrapper::Pause,
 	nullptr,
 };