From d456893f31610de9eb8943f732dee4a687c331d7 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 9 Sep 2020 14:12:00 +0200 Subject: [PATCH] acp-device: just always select the best port/profile for now --- spa/plugins/alsa/alsa-acp-device.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/spa/plugins/alsa/alsa-acp-device.c b/spa/plugins/alsa/alsa-acp-device.c index 5957d847c..3c3bc1143 100644 --- a/spa/plugins/alsa/alsa-acp-device.c +++ b/spa/plugins/alsa/alsa-acp-device.c @@ -670,12 +670,8 @@ static void card_profile_available(void *data, uint32_t index, emit_info(this, false); if (this->props.auto_profile) { - if (available == ACP_AVAILABLE_NO) { - uint32_t best = acp_card_find_best_profile_index(card, NULL); - acp_card_set_profile(card, best); - } else if (available == ACP_AVAILABLE_YES) { - acp_card_set_profile(card, index); - } + uint32_t best = acp_card_find_best_profile_index(card, NULL); + acp_card_set_profile(card, best); } } @@ -712,15 +708,13 @@ static void card_port_available(void *data, uint32_t index, for (i = 0; i < p->n_devices; i++) { struct acp_device *d = p->devices[i]; + uint32_t best; + if (!(d->flags & ACP_DEVICE_ACTIVE)) continue; - if (available == ACP_AVAILABLE_NO) { - uint32_t best = acp_device_find_best_port_index(d, NULL); - acp_device_set_port(d, best); - } else if (available == ACP_AVAILABLE_YES) { - acp_device_set_port(d, index); - } + best = acp_device_find_best_port_index(d, NULL); + acp_device_set_port(d, best); } } }