output/alsa: move AlsaSetupHw() to lib/alsa/HwSetup.cxx

Makefile.am

@@ -258,6 +258,7 @@ UPNP_SOURCES = \
 
 ALSA_SOURCES = \
 	src/lib/alsa/Version.cxx src/lib/alsa/Version.hxx \
+	src/lib/alsa/HwSetup.cxx src/lib/alsa/HwSetup.hxx \
 	src/lib/alsa/Format.hxx \
 	src/lib/alsa/PeriodBuffer.hxx \
 	src/lib/alsa/NonBlock.cxx src/lib/alsa/NonBlock.hxx

src/lib/alsa/HwSetup.cxx

+/*
+ * Copyright 2003-2017 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 "HwSetup.hxx"
+#include "Format.hxx"
+#include "system/ByteOrder.hxx"
+#include "util/Domain.hxx"
+#include "util/RuntimeError.hxx"
+#include "AudioFormat.hxx"
+#include "Log.hxx"
+
+static constexpr Domain alsa_output_domain("alsa_output");
+
+namespace Alsa {
+
+/**
+ * Attempts to configure the specified sample format.  On failure,
+ * fall back to the packed version.
+ */
+static int
+TryFormatOrPacked(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams,
+		  snd_pcm_format_t fmt, PcmExport::Params &params)
+{
+	int err = snd_pcm_hw_params_set_format(pcm, hwparams, fmt);
+	if (err == 0)
+		params.pack24 = false;
+
+	if (err != -EINVAL)
+		return err;
+
+	fmt = PackAlsaPcmFormat(fmt);
+	if (fmt == SND_PCM_FORMAT_UNKNOWN)
+		return -EINVAL;
+
+	err = snd_pcm_hw_params_set_format(pcm, hwparams, fmt);
+	if (err == 0)
+		params.pack24 = true;
+
+	return err;
+}
+
+/**
+ * Attempts to configure the specified sample format, and tries the
+ * reversed host byte order if was not supported.
+ */
+static int
+TryFormatOrByteSwap(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams,
+		    snd_pcm_format_t fmt,
+		    PcmExport::Params &params)
+{
+	int err = TryFormatOrPacked(pcm, hwparams, fmt, params);
+	if (err == 0)
+		params.reverse_endian = false;
+
+	if (err != -EINVAL)
+		return err;
+
+	fmt = ByteSwapAlsaPcmFormat(fmt);
+	if (fmt == SND_PCM_FORMAT_UNKNOWN)
+		return -EINVAL;
+
+	err = TryFormatOrPacked(pcm, hwparams, fmt, params);
+	if (err == 0)
+		params.reverse_endian = true;
+
+	return err;
+}
+
+/**
+ * Attempts to configure the specified sample format.  On DSD_U8
+ * failure, attempt to switch to DSD_U32 or DSD_U16.
+ */
+static int
+TryFormatDsd(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams,
+	     snd_pcm_format_t fmt, PcmExport::Params &params)
+{
+	int err = TryFormatOrByteSwap(pcm, hwparams, fmt, params);
+
+#if defined(ENABLE_DSD) && defined(HAVE_ALSA_DSD_U32)
+	if (err == 0) {
+		params.dsd_u16 = false;
+		params.dsd_u32 = false;
+	}
+
+	if (err == -EINVAL && fmt == SND_PCM_FORMAT_DSD_U8) {
+		/* attempt to switch to DSD_U32 */
+		fmt = IsLittleEndian()
+			? SND_PCM_FORMAT_DSD_U32_LE
+			: SND_PCM_FORMAT_DSD_U32_BE;
+		err = TryFormatOrByteSwap(pcm, hwparams, fmt, params);
+		if (err == 0)
+			params.dsd_u32 = true;
+		else
+			fmt = SND_PCM_FORMAT_DSD_U8;
+	}
+
+	if (err == -EINVAL && fmt == SND_PCM_FORMAT_DSD_U8) {
+		/* attempt to switch to DSD_U16 */
+		fmt = IsLittleEndian()
+			? SND_PCM_FORMAT_DSD_U16_LE
+			: SND_PCM_FORMAT_DSD_U16_BE;
+		err = TryFormatOrByteSwap(pcm, hwparams, fmt, params);
+		if (err == 0)
+			params.dsd_u16 = true;
+		else
+			fmt = SND_PCM_FORMAT_DSD_U8;
+	}
+#endif
+
+	return err;
+}
+
+static int
+TryFormat(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams,
+	  SampleFormat sample_format,
+	  PcmExport::Params &params)
+{
+	snd_pcm_format_t alsa_format = ToAlsaPcmFormat(sample_format);
+	if (alsa_format == SND_PCM_FORMAT_UNKNOWN)
+		return -EINVAL;
+
+	return TryFormatDsd(pcm, hwparams, alsa_format, params);
+}
+
+/**
+ * Configure a sample format, and probe other formats if that fails.
+ */
+static int
+SetupSampleFormat(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams,
+		  SampleFormat &sample_format,
+		  PcmExport::Params &params)
+{
+	/* try the input format first */
+
+	int err = TryFormat(pcm, hwparams, sample_format, params);
+
+	/* if unsupported by the hardware, try other formats */
+
+	static constexpr SampleFormat probe_formats[] = {
+		SampleFormat::S24_P32,
+		SampleFormat::S32,
+		SampleFormat::S16,
+		SampleFormat::S8,
+		SampleFormat::UNDEFINED,
+	};
+
+	for (unsigned i = 0;
+	     err == -EINVAL && probe_formats[i] != SampleFormat::UNDEFINED;
+	     ++i) {
+		const SampleFormat mpd_format = probe_formats[i];
+		if (mpd_format == sample_format)
+			continue;
+
+		err = TryFormat(pcm, hwparams, mpd_format, params);
+		if (err == 0)
+			sample_format = mpd_format;
+	}
+
+	return err;
+}
+
+void
+SetupHw(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams,
+	unsigned buffer_time, unsigned period_time,
+	AudioFormat &audio_format, PcmExport::Params &params)
+{
+	int err;
+	unsigned int period_time_ro = period_time;
+
+	/* configure HW params */
+	err = snd_pcm_hw_params_any(pcm, hwparams);
+	if (err < 0)
+		throw FormatRuntimeError("snd_pcm_hw_params_any() failed: %s",
+					 snd_strerror(-err));
+
+	err = snd_pcm_hw_params_set_access(pcm, hwparams,
+					   SND_PCM_ACCESS_RW_INTERLEAVED);
+	if (err < 0)
+		throw FormatRuntimeError("snd_pcm_hw_params_set_access() failed: %s",
+					 snd_strerror(-err));
+
+	err = SetupSampleFormat(pcm, hwparams,
+				audio_format.format, params);
+	if (err < 0)
+		throw FormatRuntimeError("Failed to configure format %s: %s",
+					 sample_format_to_string(audio_format.format),
+					 snd_strerror(-err));
+
+	unsigned int channels = audio_format.channels;
+	err = snd_pcm_hw_params_set_channels_near(pcm, hwparams,
+						  &channels);
+	if (err < 0)
+		throw FormatRuntimeError("Failed to configure %i channels: %s",
+					 (int)audio_format.channels,
+					 snd_strerror(-err));
+
+	audio_format.channels = (int8_t)channels;
+
+	const unsigned requested_sample_rate =
+		params.CalcOutputSampleRate(audio_format.sample_rate);
+	unsigned output_sample_rate = requested_sample_rate;
+
+	err = snd_pcm_hw_params_set_rate_near(pcm, hwparams,
+					      &output_sample_rate, nullptr);
+	if (err < 0)
+		throw FormatRuntimeError("Failed to configure sample rate %u Hz: %s",
+					 requested_sample_rate,
+					 snd_strerror(-err));
+
+	if (output_sample_rate == 0)
+		throw FormatRuntimeError("Failed to configure sample rate %u Hz",
+					 audio_format.sample_rate);
+
+	if (output_sample_rate != requested_sample_rate)
+		audio_format.sample_rate = params.CalcInputSampleRate(output_sample_rate);
+
+	snd_pcm_uframes_t buffer_size_min, buffer_size_max;
+	snd_pcm_hw_params_get_buffer_size_min(hwparams, &buffer_size_min);
+	snd_pcm_hw_params_get_buffer_size_max(hwparams, &buffer_size_max);
+	unsigned buffer_time_min, buffer_time_max;
+	snd_pcm_hw_params_get_buffer_time_min(hwparams, &buffer_time_min, 0);
+	snd_pcm_hw_params_get_buffer_time_max(hwparams, &buffer_time_max, 0);
+	FormatDebug(alsa_output_domain, "buffer: size=%u..%u time=%u..%u",
+		    (unsigned)buffer_size_min, (unsigned)buffer_size_max,
+		    buffer_time_min, buffer_time_max);
+
+	snd_pcm_uframes_t period_size_min, period_size_max;
+	snd_pcm_hw_params_get_period_size_min(hwparams, &period_size_min, 0);
+	snd_pcm_hw_params_get_period_size_max(hwparams, &period_size_max, 0);
+	unsigned period_time_min, period_time_max;
+	snd_pcm_hw_params_get_period_time_min(hwparams, &period_time_min, 0);
+	snd_pcm_hw_params_get_period_time_max(hwparams, &period_time_max, 0);
+	FormatDebug(alsa_output_domain, "period: size=%u..%u time=%u..%u",
+		    (unsigned)period_size_min, (unsigned)period_size_max,
+		    period_time_min, period_time_max);
+
+	if (buffer_time > 0) {
+		err = snd_pcm_hw_params_set_buffer_time_near(pcm, hwparams,
+							     &buffer_time, nullptr);
+		if (err < 0)
+			throw FormatRuntimeError("snd_pcm_hw_params_set_buffer_time_near() failed: %s",
+						 snd_strerror(-err));
+	} else {
+		err = snd_pcm_hw_params_get_buffer_time(hwparams, &buffer_time,
+							nullptr);
+		if (err < 0)
+			buffer_time = 0;
+	}
+
+	if (period_time_ro == 0 && buffer_time >= 10000) {
+		period_time_ro = period_time = buffer_time / 4;
+
+		FormatDebug(alsa_output_domain,
+			    "default period_time = buffer_time/4 = %u/4 = %u",
+			    buffer_time, period_time);
+	}
+
+	if (period_time_ro > 0) {
+		period_time = period_time_ro;
+		err = snd_pcm_hw_params_set_period_time_near(pcm, hwparams,
+							     &period_time, nullptr);
+		if (err < 0)
+			throw FormatRuntimeError("snd_pcm_hw_params_set_period_time_near() failed: %s",
+						 snd_strerror(-err));
+	}
+
+	err = snd_pcm_hw_params(pcm, hwparams);
+	if (err < 0)
+		throw FormatRuntimeError("snd_pcm_hw_params() failed: %s",
+					 snd_strerror(-err));
+}
+
+} // namespace Alsa

src/lib/alsa/HwSetup.hxx

+/*
+ * Copyright 2003-2017 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_HW_SETUP_HXX
+#define MPD_ALSA_HW_SETUP_HXX
+
+#include "check.h"
+#include "pcm/PcmExport.hxx"
+
+#include <alsa/asoundlib.h>
+
+struct AudioFormat;
+
+namespace Alsa {
+
+/**
+ * Wrapper for snd_pcm_hw_params().
+ *
+ * @param buffer_time the configured buffer time, or 0 if not configured
+ * @param period_time the configured period time, or 0 if not configured
+ * @param audio_format an #AudioFormat to be configured (or modified)
+ * by this function
+ * @param params to be modified by this function
+ */
+void
+SetupHw(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams,
+	unsigned buffer_time, unsigned period_time,
+	AudioFormat &audio_format, PcmExport::Params &params);
+
+} // namespace Alsa
+
+#endif

src/output/plugins/AlsaOutputPlugin.cxx

@@ -19,14 +19,13 @@
 
 #include "config.h"
 #include "AlsaOutputPlugin.hxx"
-#include "lib/alsa/Format.hxx"
+#include "lib/alsa/HwSetup.hxx"
 #include "lib/alsa/NonBlock.hxx"
 #include "lib/alsa/PeriodBuffer.hxx"
 #include "lib/alsa/Version.hxx"
 #include "../OutputAPI.hxx"
 #include "mixer/MixerList.hxx"
 #include "pcm/PcmExport.hxx"
-#include "system/ByteOrder.hxx"
 #include "thread/Mutex.hxx"
 #include "thread/Cond.hxx"
 #include "util/Manual.hxx"
@@ -358,272 +357,6 @@ alsa_test_default_device()
 }
 
 /**
- * Attempts to configure the specified sample format.  On failure,
- * fall back to the packed version.
- */
-static int
-AlsaTryFormatOrPacked(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams,
-		      snd_pcm_format_t fmt, PcmExport::Params &params)
-{
-	int err = snd_pcm_hw_params_set_format(pcm, hwparams, fmt);
-	if (err == 0)
-		params.pack24 = false;
-
-	if (err != -EINVAL)
-		return err;
-
-	fmt = PackAlsaPcmFormat(fmt);
-	if (fmt == SND_PCM_FORMAT_UNKNOWN)
-		return -EINVAL;
-
-	err = snd_pcm_hw_params_set_format(pcm, hwparams, fmt);
-	if (err == 0)
-		params.pack24 = true;
-
-	return err;
-}
-
-/**
- * Attempts to configure the specified sample format, and tries the
- * reversed host byte order if was not supported.
- */
-static int
-AlsaTryFormatOrByteSwap(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams,
-			snd_pcm_format_t fmt,
-			PcmExport::Params &params)
-{
-	int err = AlsaTryFormatOrPacked(pcm, hwparams, fmt, params);
-	if (err == 0)
-		params.reverse_endian = false;
-
-	if (err != -EINVAL)
-		return err;
-
-	fmt = ByteSwapAlsaPcmFormat(fmt);
-	if (fmt == SND_PCM_FORMAT_UNKNOWN)
-		return -EINVAL;
-
-	err = AlsaTryFormatOrPacked(pcm, hwparams, fmt, params);
-	if (err == 0)
-		params.reverse_endian = true;
-
-	return err;
-}
-
-/**
- * Attempts to configure the specified sample format.  On DSD_U8
- * failure, attempt to switch to DSD_U32 or DSD_U16.
- */
-static int
-AlsaTryFormatDsd(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams,
-		 snd_pcm_format_t fmt, PcmExport::Params &params)
-{
-	int err = AlsaTryFormatOrByteSwap(pcm, hwparams, fmt, params);
-
-#if defined(ENABLE_DSD) && defined(HAVE_ALSA_DSD_U32)
-	if (err == 0) {
-		params.dsd_u16 = false;
-		params.dsd_u32 = false;
-	}
-
-	if (err == -EINVAL && fmt == SND_PCM_FORMAT_DSD_U8) {
-		/* attempt to switch to DSD_U32 */
-		fmt = IsLittleEndian()
-			? SND_PCM_FORMAT_DSD_U32_LE
-			: SND_PCM_FORMAT_DSD_U32_BE;
-		err = AlsaTryFormatOrByteSwap(pcm, hwparams, fmt, params);
-		if (err == 0)
-			params.dsd_u32 = true;
-		else
-			fmt = SND_PCM_FORMAT_DSD_U8;
-	}
-
-	if (err == -EINVAL && fmt == SND_PCM_FORMAT_DSD_U8) {
-		/* attempt to switch to DSD_U16 */
-		fmt = IsLittleEndian()
-			? SND_PCM_FORMAT_DSD_U16_LE
-			: SND_PCM_FORMAT_DSD_U16_BE;
-		err = AlsaTryFormatOrByteSwap(pcm, hwparams, fmt, params);
-		if (err == 0)
-			params.dsd_u16 = true;
-		else
-			fmt = SND_PCM_FORMAT_DSD_U8;
-	}
-#endif
-
-	return err;
-}
-
-static int
-AlsaTryFormat(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams,
-	      SampleFormat sample_format,
-	      PcmExport::Params &params)
-{
-	snd_pcm_format_t alsa_format = ToAlsaPcmFormat(sample_format);
-	if (alsa_format == SND_PCM_FORMAT_UNKNOWN)
-		return -EINVAL;
-
-	return AlsaTryFormatDsd(pcm, hwparams, alsa_format, params);
-}
-
-/**
- * Configure a sample format, and probe other formats if that fails.
- */
-static int
-AlsaSetupSampleFormat(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams,
-		      SampleFormat &sample_format,
-		      PcmExport::Params &params)
-{
-	/* try the input format first */
-
-	int err = AlsaTryFormat(pcm, hwparams, sample_format, params);
-
-	/* if unsupported by the hardware, try other formats */
-
-	static constexpr SampleFormat probe_formats[] = {
-		SampleFormat::S24_P32,
-		SampleFormat::S32,
-		SampleFormat::S16,
-		SampleFormat::S8,
-		SampleFormat::UNDEFINED,
-	};
-
-	for (unsigned i = 0;
-	     err == -EINVAL && probe_formats[i] != SampleFormat::UNDEFINED;
-	     ++i) {
-		const SampleFormat mpd_format = probe_formats[i];
-		if (mpd_format == sample_format)
-			continue;
-
-		err = AlsaTryFormat(pcm, hwparams, mpd_format, params);
-		if (err == 0)
-			sample_format = mpd_format;
-	}
-
-	return err;
-}
-
-/**
- * Wrapper for snd_pcm_hw_params().
- *
- * @param buffer_time the configured buffer time, or 0 if not configured
- * @param period_time the configured period time, or 0 if not configured
- * @param audio_format an #AudioFormat to be configured (or modified)
- * by this function
- * @param params to be modified by this function
- */
-static void
-AlsaSetupHw(snd_pcm_t *pcm, snd_pcm_hw_params_t *hwparams,
-	    unsigned buffer_time, unsigned period_time,
-	    AudioFormat &audio_format, PcmExport::Params &params)
-{
-	int err;
-	unsigned int period_time_ro = period_time;
-
-	/* configure HW params */
-	err = snd_pcm_hw_params_any(pcm, hwparams);
-	if (err < 0)
-		throw FormatRuntimeError("snd_pcm_hw_params_any() failed: %s",
-					 snd_strerror(-err));
-
-	err = snd_pcm_hw_params_set_access(pcm, hwparams,
-					   SND_PCM_ACCESS_RW_INTERLEAVED);
-	if (err < 0)
-		throw FormatRuntimeError("snd_pcm_hw_params_set_access() failed: %s",
-					 snd_strerror(-err));
-
-	err = AlsaSetupSampleFormat(pcm, hwparams,
-				    audio_format.format, params);
-	if (err < 0)
-		throw FormatRuntimeError("Failed to configure format %s: %s",
-					 sample_format_to_string(audio_format.format),
-					 snd_strerror(-err));
-
-	unsigned int channels = audio_format.channels;
-	err = snd_pcm_hw_params_set_channels_near(pcm, hwparams,
-						  &channels);
-	if (err < 0)
-		throw FormatRuntimeError("Failed to configure %i channels: %s",
-					 (int)audio_format.channels,
-					 snd_strerror(-err));
-
-	audio_format.channels = (int8_t)channels;
-
-	const unsigned requested_sample_rate =
-		params.CalcOutputSampleRate(audio_format.sample_rate);
-	unsigned output_sample_rate = requested_sample_rate;
-
-	err = snd_pcm_hw_params_set_rate_near(pcm, hwparams,
-					      &output_sample_rate, nullptr);
-	if (err < 0)
-		throw FormatRuntimeError("Failed to configure sample rate %u Hz: %s",
-					 requested_sample_rate,
-					 snd_strerror(-err));
-
-	if (output_sample_rate == 0)
-		throw FormatRuntimeError("Failed to configure sample rate %u Hz",
-					 audio_format.sample_rate);
-
-	if (output_sample_rate != requested_sample_rate)
-		audio_format.sample_rate = params.CalcInputSampleRate(output_sample_rate);
-
-	snd_pcm_uframes_t buffer_size_min, buffer_size_max;
-	snd_pcm_hw_params_get_buffer_size_min(hwparams, &buffer_size_min);
-	snd_pcm_hw_params_get_buffer_size_max(hwparams, &buffer_size_max);
-	unsigned buffer_time_min, buffer_time_max;
-	snd_pcm_hw_params_get_buffer_time_min(hwparams, &buffer_time_min, 0);
-	snd_pcm_hw_params_get_buffer_time_max(hwparams, &buffer_time_max, 0);
-	FormatDebug(alsa_output_domain, "buffer: size=%u..%u time=%u..%u",
-		    (unsigned)buffer_size_min, (unsigned)buffer_size_max,
-		    buffer_time_min, buffer_time_max);
-
-	snd_pcm_uframes_t period_size_min, period_size_max;
-	snd_pcm_hw_params_get_period_size_min(hwparams, &period_size_min, 0);
-	snd_pcm_hw_params_get_period_size_max(hwparams, &period_size_max, 0);
-	unsigned period_time_min, period_time_max;
-	snd_pcm_hw_params_get_period_time_min(hwparams, &period_time_min, 0);
-	snd_pcm_hw_params_get_period_time_max(hwparams, &period_time_max, 0);
-	FormatDebug(alsa_output_domain, "period: size=%u..%u time=%u..%u",
-		    (unsigned)period_size_min, (unsigned)period_size_max,
-		    period_time_min, period_time_max);
-
-	if (buffer_time > 0) {
-		err = snd_pcm_hw_params_set_buffer_time_near(pcm, hwparams,
-							     &buffer_time, nullptr);
-		if (err < 0)
-			throw FormatRuntimeError("snd_pcm_hw_params_set_buffer_time_near() failed: %s",
-						 snd_strerror(-err));
-	} else {
-		err = snd_pcm_hw_params_get_buffer_time(hwparams, &buffer_time,
-							nullptr);
-		if (err < 0)
-			buffer_time = 0;
-	}
-
-	if (period_time_ro == 0 && buffer_time >= 10000) {
-		period_time_ro = period_time = buffer_time / 4;
-
-		FormatDebug(alsa_output_domain,
-			    "default period_time = buffer_time/4 = %u/4 = %u",
-			    buffer_time, period_time);
-	}
-
-	if (period_time_ro > 0) {
-		period_time = period_time_ro;
-		err = snd_pcm_hw_params_set_period_time_near(pcm, hwparams,
-							     &period_time, nullptr);
-		if (err < 0)
-			throw FormatRuntimeError("snd_pcm_hw_params_set_period_time_near() failed: %s",
-						 snd_strerror(-err));
-	}
-
-	err = snd_pcm_hw_params(pcm, hwparams);
-	if (err < 0)
-		throw FormatRuntimeError("snd_pcm_hw_params() failed: %s",
-					 snd_strerror(-err));
-}
-
-/**
  * Wrapper for snd_pcm_sw_params().
  */
 static void
@@ -662,7 +395,7 @@ AlsaOutput::Setup(AudioFormat &audio_format,
 	snd_pcm_hw_params_t *hwparams;
 	snd_pcm_hw_params_alloca(&hwparams);
 
-	AlsaSetupHw(pcm, hwparams,
+	Alsa::SetupHw(pcm, hwparams,
 		      buffer_time, period_time,
 		      audio_format, params);