oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/alsa: disable DoP if it fails

Browse Source 
See http://bugs.musicpd.org/view.php?id=4496
This commit is contained in:
Max Kellermann
2016-02-28 10:15:02 +01:00
parent ddce544b53
commit 92f54f0b59
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/output/plugins/AlsaOutputPlugin.cxx
View File

@@ -731,13 +731,25 @@ AlsaOutput::SetupOrDop(AudioFormat &audio_format, PcmExport::Params &params,
Error &error)
{
#ifdef ENABLE_DSD
if (dop && audio_format.format == SampleFormat::DSD) {
Error dop_error;
if (dop && audio_format.format == SampleFormat::DSD &&
SetupDop(audio_format, params, dop_error)) {
params.dop = true;
return SetupDop(audio_format, params, error);
return true;
}
#endif
return AlsaSetup(this, audio_format, params, error);
if (AlsaSetup(this, audio_format, params, error))
return true;
#ifdef ENABLE_DSD
if (dop_error.IsDefined())
/* if DoP was attempted, prefer returning the original
DoP error instead of the fallback error */
error = std::move(dop_error);
#endif
return false;
}
inline bool