From 4d238946ca2a699ce69ea78c50f1d451dc770333 Mon Sep 17 00:00:00 2001 From: Thomas Guillem Date: Fri, 9 Dec 2022 11:07:30 +0100 Subject: [PATCH] aout: also propose stereo mix-mode if the spatialaudio module is missing If the content is not ambisonics. --- src/audio_output/output.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/audio_output/output.c b/src/audio_output/output.c index 7236ea740c6c..d72cba26f391 100644 --- a/src/audio_output/output.c +++ b/src/audio_output/output.c @@ -577,10 +577,13 @@ static void aout_SetupMixModeChoices (audio_output_t *aout, const bool has_spatialaudio = module_exists("spatialaudio"); - aout_AddMixModeChoice(aout, AOUT_MIX_MODE_UNSET, _("Original"), fmt); - - if (fmt->channel_type != AUDIO_CHANNEL_TYPE_AMBISONICS && has_spatialaudio) + /* Don't propose the mix option if we don't have the spatialaudio module + * and if the content is ambisonics */ + if (fmt->channel_type != AUDIO_CHANNEL_TYPE_AMBISONICS || has_spatialaudio) + { + aout_AddMixModeChoice(aout, AOUT_MIX_MODE_UNSET, _("Original"), fmt); aout_AddMixModeChoice(aout, AOUT_MIX_MODE_STEREO, _("Stereo"), NULL); + } if (has_spatialaudio) aout_AddMixModeChoice(aout, AOUT_MIX_MODE_BINAURAL, _("Binaural"), NULL);