From db7eec042eedb911594c95139e74ea07c3699d63 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Tue, 8 Nov 2016 15:15:16 +0100
Subject: [PATCH] output/sndio: migrate from class Error to C++ exceptions

---
 src/output/plugins/SndioOutputPlugin.cxx | 67 ++++++++----------------
 1 file changed, 22 insertions(+), 45 deletions(-)

diff --git a/src/output/plugins/SndioOutputPlugin.cxx b/src/output/plugins/SndioOutputPlugin.cxx
index b4898dcd5..cb615f4d0 100644
--- a/src/output/plugins/SndioOutputPlugin.cxx
+++ b/src/output/plugins/SndioOutputPlugin.cxx
@@ -17,19 +17,17 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <sndio.h>
-#include <string.h>
-#include <unistd.h>
-
 #include "config.h"
 #include "SndioOutputPlugin.hxx"
-#include "config/ConfigError.hxx"
 #include "../OutputAPI.hxx"
 #include "../Wrapper.hxx"
-#include "util/Error.hxx"
 #include "util/Domain.hxx"
 #include "Log.hxx"
 
+#include <sndio.h>
+
+#include <stdexcept>
+
 #ifndef SIO_DEVANY
 /* this macro is missing in libroar-dev 1.0~beta2-3 (Debian Wheezy) */
 #define SIO_DEVANY "default"
@@ -42,14 +40,12 @@ static constexpr Domain sndio_output_domain("sndio_output");
 class SndioOutput {
 	friend struct AudioOutputWrapper<SndioOutput>;
 	AudioOutput base;
-	const char *device;
-	unsigned buffer_time; /* in ms */
+	const char *const device;
+	const unsigned buffer_time; /* in ms */
 	struct sio_hdl *sio_hdl;
 
 public:
-	SndioOutput()
-		:base(sndio_output_plugin) {}
-	~SndioOutput() {}
+	SndioOutput(const ConfigBlock &block);
 
 	bool Configure(const ConfigBlock &block, Error &error);
 
@@ -62,28 +58,18 @@ public:
 	void Cancel();
 };
 
-bool
-SndioOutput::Configure(const ConfigBlock &block, Error &error)
+SndioOutput::SndioOutput(const ConfigBlock &block)
+	:base(sndio_output_plugin, block),
+	 device(block.GetBlockValue("device", SIO_DEVANY)),
+	 buffer_time(block.GetBlockValue("buffer_time",
+					 MPD_SNDIO_BUFFER_TIME_MS))
 {
-	if (!base.Configure(block, error))
-		return false;
-	device = block.GetBlockValue("device", SIO_DEVANY);
-	buffer_time = block.GetBlockValue("buffer_time",
-	                                  MPD_SNDIO_BUFFER_TIME_MS);
-	return true;
 }
 
 SndioOutput *
-SndioOutput::Create(const ConfigBlock &block, Error &error)
+SndioOutput::Create(const ConfigBlock &block, Error &)
 {
-	SndioOutput *ao = new SndioOutput();
-
-	if (!ao->Configure(block, error)) {
-		delete ao;
-		return nullptr;
-	}
-
-	return ao;
+	return new SndioOutput(block);
 }
 
 static bool
@@ -103,17 +89,14 @@ sndio_test_default_device()
 }
 
 bool
-SndioOutput::Open(AudioFormat &audio_format, Error &error)
+SndioOutput::Open(AudioFormat &audio_format, Error &)
 {
 	struct sio_par par;
 	unsigned bits, rate, chans;
 
 	sio_hdl = sio_open(device, SIO_PLAY, 0);
-	if (!sio_hdl) {
-		error.Format(sndio_output_domain, -1,
-		             "Failed to open default sndio device");
-		return false;
-	}
+	if (!sio_hdl)
+		throw std::runtime_error("Failed to open default sndio device");
 
 	switch (audio_format.format) {
 	case SampleFormat::S16:
@@ -144,10 +127,8 @@ SndioOutput::Open(AudioFormat &audio_format, Error &error)
 
 	if (!sio_setpar(sio_hdl, &par) ||
 	    !sio_getpar(sio_hdl, &par)) {
-		error.Format(sndio_output_domain, -1,
-		             "Failed to set/get audio params");
 		sio_close(sio_hdl);
-		return false;
+		throw std::runtime_error("Failed to set/get audio params");
 	}
 
 	if (par.bits != bits ||
@@ -156,17 +137,13 @@ SndioOutput::Open(AudioFormat &audio_format, Error &error)
 	    par.pchan != chans ||
 	    par.sig != 1 ||
 	    par.le != SIO_LE_NATIVE) {
-		error.Format(sndio_output_domain, -1,
-		             "Requested audio params cannot be satisfied");
 		sio_close(sio_hdl);
-		return false;
+		throw std::runtime_error("Requested audio params cannot be satisfied");
 	}
 
 	if (!sio_start(sio_hdl)) {
-		error.Format(sndio_output_domain, -1,
-		             "Failed to start audio device");
 		sio_close(sio_hdl);
-		return false;
+		throw std::runtime_error("Failed to start audio device");
 	}
 
 	return true;
@@ -179,13 +156,13 @@ SndioOutput::Close()
 }
 
 size_t
-SndioOutput::Play(const void *chunk, size_t size, Error &error)
+SndioOutput::Play(const void *chunk, size_t size, Error &)
 {
 	size_t n;
 
 	n = sio_write(sio_hdl, chunk, size);
 	if (n == 0 && sio_eof(sio_hdl) != 0)
-		error.Set(sndio_output_domain, -1, "sndio write failed");
+		throw std::runtime_error("sndio write failed");
 	return n;
 }