From: Mikel Astiz <mikel.astiz.oss@gmail.com>
To: linux-bluetooth@vger.kernel.org
Cc: Mikel Astiz <mikel.astiz@bmw-carit.de>
Subject: [PATCH BlueZ v1 4/5] media: Create multiple transports if needed
Date: Fri, 27 Apr 2012 12:59:46 +0200 [thread overview]
Message-ID: <1335524387-22831-5-git-send-email-mikel.astiz.oss@gmail.com> (raw)
In-Reply-To: <1335524387-22831-1-git-send-email-mikel.astiz.oss@gmail.com>
From: Mikel Astiz <mikel.astiz@bmw-carit.de>
During endpoint registration one than one device might be connected.
Thus all matching devices should have one transport each.
---
audio/media.c | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/audio/media.c b/audio/media.c
index 23c3217..5cbf4a2 100644
--- a/audio/media.c
+++ b/audio/media.c
@@ -589,27 +589,14 @@ static void clear_config(struct a2dp_sep *sep, void *user_data)
clear_endpoint(endpoint);
}
-static struct media_transport *get_unique_transport(
- struct media_endpoint *endpoint)
-{
- if (endpoint->transports == NULL)
- return NULL;
-
- if (endpoint->transports->next != NULL)
- return NULL;
-
- return endpoint->transports->data;
-}
-
static void set_delay(struct a2dp_sep *sep, uint16_t delay, void *user_data)
{
struct media_endpoint *endpoint = user_data;
- struct media_transport *transport = get_unique_transport(endpoint);
- if (transport == NULL)
+ if (endpoint->transports == NULL)
return;
- media_transport_update_delay(transport, delay);
+ media_transport_update_delay(endpoint->transports->data, delay);
}
static struct a2dp_endpoint a2dp_endpoint = {
@@ -713,26 +700,40 @@ static struct media_endpoint *media_endpoint_create(struct media_adapter *adapte
goto failed;
} else if (strcasecmp(uuid, HFP_AG_UUID) == 0 ||
strcasecmp(uuid, HSP_AG_UUID) == 0) {
- struct audio_device *dev;
+ GSList *list;
+ GSList *l;
endpoint->hs_watch = headset_add_state_cb(headset_state_changed,
endpoint);
- dev = manager_find_device(NULL, &adapter->src, BDADDR_ANY,
+ list = manager_find_devices(NULL, &adapter->src, BDADDR_ANY,
AUDIO_HEADSET_INTERFACE, TRUE);
- if (dev)
+
+ for (l = list; l != NULL; l = l->next) {
+ struct audio_device *dev = l->data;
+
set_configuration(endpoint, dev, NULL, 0,
headset_setconf_cb, dev, NULL);
+ }
+
+ g_slist_free(list);
} else if (strcasecmp(uuid, HFP_HS_UUID) == 0 ||
strcasecmp(uuid, HSP_HS_UUID) == 0) {
- struct audio_device *dev;
+ GSList *list;
+ GSList *l;
endpoint->ag_watch = gateway_add_state_cb(gateway_state_changed,
endpoint);
- dev = manager_find_device(NULL, &adapter->src, BDADDR_ANY,
+ list = manager_find_devices(NULL, &adapter->src, BDADDR_ANY,
AUDIO_GATEWAY_INTERFACE, TRUE);
- if (dev)
+
+ for (l = list; l != NULL; l = l->next) {
+ struct audio_device *dev = l->data;
+
set_configuration(endpoint, dev, NULL, 0,
gateway_setconf_cb, dev, NULL);
+ }
+
+ g_slist_free(list);
} else {
if (err)
*err = -EINVAL;
--
1.7.7.6
next prev parent reply other threads:[~2012-04-27 10:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-27 10:59 [PATCH BlueZ v1 0/5] Multiple Bluetooth SCO connections (userspace) Mikel Astiz
2012-04-27 10:59 ` [PATCH BlueZ v1 1/5] audio: Fix gateway state check Mikel Astiz
2012-04-27 10:59 ` [PATCH BlueZ v1 2/5] audio: Add multiple device search to manager Mikel Astiz
2012-04-27 10:59 ` [PATCH BlueZ v1 3/5] media: Support multiple transports per endpoint Mikel Astiz
2012-04-27 10:59 ` Mikel Astiz [this message]
2012-04-27 11:45 ` [PATCH BlueZ v1 4/5] media: Create multiple transports if needed Luiz Augusto von Dentz
2012-04-27 10:59 ` [PATCH BlueZ v1 5/5] media: Enable parallel requests to endpoint Mikel Astiz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1335524387-22831-5-git-send-email-mikel.astiz.oss@gmail.com \
--to=mikel.astiz.oss@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=mikel.astiz@bmw-carit.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).