[vlc-commits] [Git][videolan/vlc][master] aout: also propose stereo mix-mode if the spatialaudio module is missing
Steve Lhomme (@robUx4)
gitlab at videolan.org
Wed Dec 14 09:55:33 UTC 2022
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
4d238946 by Thomas Guillem at 2022-12-14T09:36:01+00:00
aout: also propose stereo mix-mode if the spatialaudio module is missing
If the content is not ambisonics.
- - - - -
1 changed file:
- src/audio_output/output.c
Changes:
=====================================
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);
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/4d238946ca2a699ce69ea78c50f1d451dc770333
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/4d238946ca2a699ce69ea78c50f1d451dc770333
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list