media: clear the right transport when clearing BAP endpoint

Each configured BAP stream is associated with a transport, and only that
transport should be cleared when the stream's configuration is cleared.

This is required for multiple BAP clients to use the same Media1
endpoint, which is what we should aim for to follow the spirit in which
the endpoints work in ASCS.  Sound servers generally can handle this,
since the *Configuration calls provide the transport paths, and for
different clients they are associated with different devices.

diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index a1d385d..66263cb 100644 (file)
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -102,7 +102,6 @@ struct endpoint_request {
 struct media_endpoint {
        struct a2dp_sep         *sep;
        struct bt_bap_pac       *pac;
-       void                    *stream;
        char                    *sender;        /* Endpoint DBus bus id */
        char                    *path;          /* Endpoint object path */
        char                    *uuid;          /* Endpoint property UUID */
@@ -1218,9 +1217,6 @@ static void pac_config_cb(struct media_endpoint *endpoint, void *ret, int size,
        struct pac_config_data *data = user_data;
        gboolean *ret_value = ret;
 
-       if (ret_value)
-               endpoint->stream = data->stream;
-
        data->cb(data->stream, ret_value ? 0 : -EINVAL);
 }
 
@@ -1300,11 +1296,20 @@ static int pac_config(struct bt_bap_stream *stream, struct iovec *cfg,
 static void pac_clear(struct bt_bap_stream *stream, void *user_data)
 {
        struct media_endpoint *endpoint = user_data;
+       struct media_transport *transport;
+       const char *path;
+
+       path = bt_bap_stream_get_user_data(stream);
+       if (!path)
+               return;
 
-       endpoint->stream = NULL;
+       DBG("endpoint %p path %s", endpoint, path);
 
-       while (endpoint->transports != NULL)
-               clear_configuration(endpoint, endpoint->transports->data);
+       transport = find_transport(endpoint, path);
+       if (transport) {
+               clear_configuration(endpoint, transport);
+               bt_bap_stream_set_user_data(stream, NULL);
+       }
 }
 
 static struct bt_bap_pac_ops pac_ops = {