From b3edd127a6d7409730d81b3dd91f0acec2663b88 Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Wed, 10 Jun 2020 11:36:01 +0300 Subject: [PATCH] alsa-sink, alsa-source: Use a more appropriate function for enabling UCM devices pa_alsa_ucm_set_port() disables devices in addition to enabling them, which is unnecessary during initialization. --- src/modules/alsa/alsa-sink.c | 6 ++---- src/modules/alsa/alsa-source.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c index eb00281e5..5121580f5 100644 --- a/src/modules/alsa/alsa-sink.c +++ b/src/modules/alsa/alsa-sink.c @@ -2155,10 +2155,8 @@ static int setup_mixer(struct userdata *u, bool ignore_dB) { * configuration doesn't specify volume or mute controls, u->mixer_handle * will be NULL, but the UCM device enable sequence will still need to be * executed. */ - if (u->sink->active_port && u->ucm_context) { - if (pa_alsa_ucm_set_port(u->ucm_context, u->sink->active_port, true) < 0) - return -1; - } + if (u->sink->active_port && u->ucm_context) + pa_alsa_ucm_port_enable_devices(PA_DEVICE_PORT_DATA(u->sink->active_port), true); if (!u->mixer_handle) return 0; diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c index 2044b30d0..2556bf177 100644 --- a/src/modules/alsa/alsa-source.c +++ b/src/modules/alsa/alsa-source.c @@ -1861,10 +1861,8 @@ static int setup_mixer(struct userdata *u, bool ignore_dB) { * configuration doesn't specify volume or mute controls, u->mixer_handle * will be NULL, but the UCM device enable sequence will still need to be * executed. */ - if (u->source->active_port && u->ucm_context) { - if (pa_alsa_ucm_set_port(u->ucm_context, u->source->active_port, false) < 0) - return -1; - } + if (u->source->active_port && u->ucm_context) + pa_alsa_ucm_port_enable_devices(PA_DEVICE_PORT_DATA(u->source->active_port), true); if (!u->mixer_handle) return 0;