From 036371c48f32ecd97dddb0bfcaa87edf8fe7909c Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 11 Oct 2021 11:35:29 +0200 Subject: [PATCH] media-session: fix aux channels links AUX channels can link to any other channel but when AUX channels are linked, they must match exactly. Fixes some issues with split devices with aux channels. --- src/media-session/media-session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/media-session/media-session.c b/src/media-session/media-session.c index 2254a754f..adb823028 100644 --- a/src/media-session/media-session.c +++ b/src/media-session/media-session.c @@ -1816,12 +1816,12 @@ static int score_ports(struct sm_port *out, struct sm_port *in) (out->channel == SPA_AUDIO_CHANNEL_MONO && in->channel == SPA_AUDIO_CHANNEL_FC)) score += 50; else if (in->channel == SPA_AUDIO_CHANNEL_UNKNOWN || - channel_is_aux(in->channel) || in->channel == SPA_AUDIO_CHANNEL_MONO || out->channel == SPA_AUDIO_CHANNEL_UNKNOWN || - channel_is_aux(out->channel) || out->channel == SPA_AUDIO_CHANNEL_MONO) score += 10; + else if (channel_is_aux(in->channel) != channel_is_aux(out->channel)) + score += 7; if (score > 0 && !in->visited) score += 5; if (score <= 10)