From 86782faa18b32941eb2e39dd552d58b934279f1a Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 14 Oct 2008 17:21:49 +0200 Subject: alsa: optionally disable resampling and others Added mpd.conf options for disabling automatic resamling, sample format and channel conversion. This way, users may choose to override ALSA's automatic resampling, and use libsamplerate instead. --- src/audioOutputs/audioOutput_alsa.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'src/audioOutputs') diff --git a/src/audioOutputs/audioOutput_alsa.c b/src/audioOutputs/audioOutput_alsa.c index ebe40d04c..e2132b9b9 100644 --- a/src/audioOutputs/audioOutput_alsa.c +++ b/src/audioOutputs/audioOutput_alsa.c @@ -37,6 +37,10 @@ typedef snd_pcm_sframes_t alsa_writei_t(snd_pcm_t * pcm, const void *buffer, typedef struct _AlsaData { const char *device; + + /** the mode flags passed to snd_pcm_open */ + int mode; + snd_pcm_t *pcmHandle; alsa_writei_t *writei; unsigned int buffer_time; @@ -50,6 +54,7 @@ static AlsaData *newAlsaData(void) AlsaData *ret = xmalloc(sizeof(AlsaData)); ret->device = default_device; + ret->mode = 0; ret->pcmHandle = NULL; ret->writei = snd_pcm_writei; ret->useMmap = 0; @@ -80,6 +85,15 @@ alsa_configure(AlsaData *ad, ConfigParam *param) ad->buffer_time = atoi(bp->value); if ((bp = getBlockParam(param, "period_time"))) ad->period_time = atoi(bp->value); + + if (!getBoolBlockParam(param, "auto_resample", true)) + ad->mode |= SND_PCM_NO_AUTO_RESAMPLE; + + if (!getBoolBlockParam(param, "auto_channels", true)) + ad->mode |= SND_PCM_NO_AUTO_CHANNELS; + + if (!getBoolBlockParam(param, "auto_format", true)) + ad->mode |= SND_PCM_NO_AUTO_FORMAT; } static void *alsa_initDriver(mpd_unused struct audio_output *ao, @@ -156,7 +170,7 @@ static int alsa_openDevice(void *data, struct audio_format *audioFormat) ad->device, audioFormat->bits); err = snd_pcm_open(&ad->pcmHandle, ad->device, - SND_PCM_STREAM_PLAYBACK, 0); + SND_PCM_STREAM_PLAYBACK, ad->mode); if (err < 0) { ad->pcmHandle = NULL; goto error; -- cgit v1.2.3