From b78cc7e48aa261577efab4750ec8d2e735c0d4da Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 9 Nov 2016 11:59:31 +0100 Subject: [PATCH] output/Thread: remove obsolete pcm_domain check, this is defunct --- src/output/OutputThread.cxx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/output/OutputThread.cxx b/src/output/OutputThread.cxx index 20a9febb8..62db4a233 100644 --- a/src/output/OutputThread.cxx +++ b/src/output/OutputThread.cxx @@ -22,7 +22,6 @@ #include "OutputAPI.hxx" #include "Domain.hxx" #include "pcm/PcmMix.hxx" -#include "pcm/Domain.hxx" #include "notify.hxx" #include "filter/FilterInternal.hxx" #include "filter/plugins/ConvertFilterPlugin.hxx" @@ -217,8 +216,7 @@ AudioOutput::Open() mutex.unlock(); ao_plugin_close(this); - if (error.IsDomain(pcm_domain) && - out_audio_format.format == SampleFormat::DSD) { + if (out_audio_format.format == SampleFormat::DSD) { /* if the audio output supports DSD, but not the given sample rate, it asks MPD to resample; resampling DSD however is not @@ -232,9 +230,6 @@ AudioOutput::Open() out_audio_format = retry_audio_format; out_audio_format.format = SampleFormat::FLOAT; - /* clear the Error to allow reusing it */ - error.Clear(); - /* sorry for the "goto" - this is a workaround for the stable branch that should be as unintrusive as possible */