From dc0cf0afeb7e2cd27bf90771468dbfd460fe9f38 Mon Sep 17 00:00:00 2001
From: Tanu Kaskinen <tanuk@iki.fi>
Date: Wed, 10 Jun 2020 11:38:49 +0300
Subject: [PATCH] alsa-ucm: Simplify pa_alsa_ucm_set_port() implementation

The old implementation disabled all UCM devices belonging to a mapping,
which was unnecessary. Only the old port's UCM devices need to be
disabled, all other devices should already be disabled.

ucm_port_contains() isn't used any more.
---
 src/modules/alsa/alsa-sink.c   |  2 +-
 src/modules/alsa/alsa-source.c |  2 +-
 src/modules/alsa/alsa-ucm.c    | 67 +++-------------------------------
 src/modules/alsa/alsa-ucm.h    |  2 +-
 4 files changed, 9 insertions(+), 64 deletions(-)

diff --git a/src/modules/alsa/alsa-sink.c b/src/modules/alsa/alsa-sink.c
index 5121580f5..408eee2d4 100644
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -1675,7 +1675,7 @@ static int sink_set_port_ucm_cb(pa_sink *s, pa_device_port *p) {
     else
         sync_mixer(u, p);
 
-    return pa_alsa_ucm_set_port(u->ucm_context, p, true);
+    return pa_alsa_ucm_set_port(s->active_port, p);
 }
 
 static int sink_set_port_cb(pa_sink *s, pa_device_port *p) {
diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c
index 2556bf177..6bc220dda 100644
--- a/src/modules/alsa/alsa-source.c
+++ b/src/modules/alsa/alsa-source.c
@@ -1546,7 +1546,7 @@ static int source_set_port_ucm_cb(pa_source *s, pa_device_port *p) {
     else
         sync_mixer(u, p);
 
-    return pa_alsa_ucm_set_port(u->ucm_context, p, false);
+    return pa_alsa_ucm_set_port(s->active_port, p);
 }
 
 static int source_set_port_cb(pa_source *s, pa_device_port *p) {
diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
index 34d209b06..e23132d20 100644
--- a/src/modules/alsa/alsa-ucm.c
+++ b/src/modules/alsa/alsa-ucm.c
@@ -1057,27 +1057,6 @@ static void ucm_add_port_combination(
     }
 }
 
-static int ucm_port_contains(const char *port_name, const char *dev_name, bool is_sink) {
-    int ret = 0;
-    const char *r;
-    const char *state = NULL;
-    size_t len;
-
-    if (!port_name || !dev_name)
-        return false;
-
-    port_name += is_sink ? strlen(PA_UCM_PRE_TAG_OUTPUT) : strlen(PA_UCM_PRE_TAG_INPUT);
-
-    while ((r = pa_split_in_place(port_name, "+", &len, &state))) {
-        if (strlen(dev_name) == len && !strncmp(r, dev_name, len)) {
-            ret = 1;
-            break;
-        }
-    }
-
-    return ret;
-}
-
 static int ucm_check_conformance(
         pa_alsa_ucm_mapping_context *context,
         pa_alsa_ucm_device **pdevices,
@@ -1307,48 +1286,14 @@ int pa_alsa_ucm_set_profile(pa_alsa_ucm_config *ucm, pa_card *card, const char *
     return ret;
 }
 
-int pa_alsa_ucm_set_port(pa_alsa_ucm_mapping_context *context, pa_device_port *port, bool is_sink) {
-    int i;
-    int ret = 0;
-    pa_alsa_ucm_config *ucm;
-    const char **enable_devs;
-    int enable_num = 0;
-    uint32_t idx;
-    pa_alsa_ucm_device *dev;
+int pa_alsa_ucm_set_port(pa_device_port *old_port, pa_device_port *new_port) {
+    pa_assert(old_port);
+    pa_assert(new_port);
 
-    pa_assert(context && context->ucm);
+    pa_alsa_ucm_port_enable_devices(PA_DEVICE_PORT_DATA(old_port), false);
+    pa_alsa_ucm_port_enable_devices(PA_DEVICE_PORT_DATA(new_port), true);
 
-    ucm = context->ucm;
-    pa_assert(ucm->ucm_mgr);
-
-    enable_devs = pa_xnew(const char *, pa_idxset_size(context->ucm_devices));
-
-    /* first disable then enable */
-    PA_IDXSET_FOREACH(dev, context->ucm_devices, idx) {
-        if (ucm_port_contains(port->name, dev->name, is_sink))
-            enable_devs[enable_num++] = dev->name;
-        else {
-            pa_log_debug("Disable ucm device %s", dev->name);
-            if (snd_use_case_set(ucm->ucm_mgr, "_disdev", dev->name) > 0) {
-                pa_log("Failed to disable ucm device %s", dev->name);
-                ret = -1;
-                break;
-            }
-        }
-    }
-
-    for (i = 0; i < enable_num; i++) {
-        pa_log_debug("Enable ucm device %s", enable_devs[i]);
-        if (snd_use_case_set(ucm->ucm_mgr, "_enadev", enable_devs[i]) < 0) {
-            pa_log("Failed to enable ucm device %s", enable_devs[i]);
-            ret = -1;
-            break;
-        }
-    }
-
-    pa_xfree(enable_devs);
-
-    return ret;
+    return 0;
 }
 
 static void ucm_add_mapping(pa_alsa_profile *p, pa_alsa_mapping *m) {
diff --git a/src/modules/alsa/alsa-ucm.h b/src/modules/alsa/alsa-ucm.h
index a64fc8476..6287926ab 100644
--- a/src/modules/alsa/alsa-ucm.h
+++ b/src/modules/alsa/alsa-ucm.h
@@ -164,7 +164,7 @@ void pa_alsa_ucm_add_ports_combination(
         pa_hashmap *ports,
         pa_card_profile *cp,
         pa_core *core);
-int pa_alsa_ucm_set_port(pa_alsa_ucm_mapping_context *context, pa_device_port *port, bool is_sink);
+int pa_alsa_ucm_set_port(pa_device_port *old_port, pa_device_port *new_port);
 
 void pa_alsa_ucm_free(pa_alsa_ucm_config *ucm);
 void pa_alsa_ucm_mapping_context_free(pa_alsa_ucm_mapping_context *context);