Rename BAA_SERVICE to BCAST_AA_SERVICE and added BCAST_AA_SERVICE(0x1851)
as UUID for the broadcast sink.
Silviu Florian Barbulescu (1):
Rename BAA_SERVICE to BCAST_AA_SERVICE and added
BASIC_AA_SERVICE(0x1851) as UUID for the broadcast sink.
client/player.c | 8 ++++----
lib/uuid.h | 7 +++++--
profiles/audio/bap.c | 2 +-
profiles/audio/media.c | 2 +-
profiles/audio/transport.c | 4 ++--
5 files changed, 13 insertions(+), 10 deletions(-)
base-commit: d8ca06631b7434ea8837f9c571bfe31d6602d31f
--
2.34.1
Rename BAA_SERVICE to BCAST_AA_SERVICE and added BCAST_AA_SERVICE(0x1851)
as UUID for the broadcast sink.
---
client/player.c | 8 ++++----
lib/uuid.h | 7 +++++--
profiles/audio/bap.c | 2 +-
profiles/audio/media.c | 2 +-
profiles/audio/transport.c | 4 ++--
5 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/client/player.c b/client/player.c
index e5084967a..508f73001 100644
--- a/client/player.c
+++ b/client/player.c
@@ -1180,7 +1180,7 @@ static const struct capabilities {
* Channel count: 3
* Frame length: 30-240
*/
- CODEC_CAPABILITIES(BAA_SERVICE_UUID, LC3_ID,
+ CODEC_CAPABILITIES(BCAST_AA_SERVICE_UUID, LC3_ID,
LC3_DATA(LC3_FREQ_ANY, LC3_DURATION_ANY,
3u, 30, 240)),
};
@@ -1464,7 +1464,7 @@ static struct preset {
PRESET(A2DP_SINK_UUID, A2DP_CODEC_SBC, sbc_presets, 6),
PRESET(PAC_SINK_UUID, LC3_ID, lc3_presets, 3),
PRESET(PAC_SOURCE_UUID, LC3_ID, lc3_presets, 3),
- PRESET(BAA_SERVICE_UUID, LC3_ID, lc3_presets, 3),
+ PRESET(BCAST_AA_SERVICE_UUID, LC3_ID, lc3_presets, 3),
};
static void parse_vendor_codec(const char *codec, uint16_t *vid, uint16_t *cid)
@@ -2455,7 +2455,7 @@ static void endpoint_auto_accept(const char *input, void *user_data)
{
struct endpoint *ep = user_data;
- if (!strcmp(ep->uuid, BAA_SERVICE_UUID)) {
+ if (!strcmp(ep->uuid, BCAST_AA_SERVICE_UUID)) {
ep->broadcast = true;
} else {
ep->broadcast = false;
@@ -3189,7 +3189,7 @@ static struct endpoint *endpoint_new(const struct capabilities *cap)
ep = new0(struct endpoint, 1);
ep->uuid = g_strdup(cap->uuid);
- ep->broadcast = strcmp(cap->uuid, BAA_SERVICE_UUID) ? false : true;
+ ep->broadcast = strcmp(cap->uuid, BCAST_AA_SERVICE_UUID) ? false : true;
ep->codec = cap->codec_id;
ep->path = g_strdup_printf("%s/ep%u", BLUEZ_MEDIA_ENDPOINT_PATH,
g_list_length(local_endpoints));
diff --git a/lib/uuid.h b/lib/uuid.h
index cd3b3655f..cd9e62f1a 100644
--- a/lib/uuid.h
+++ b/lib/uuid.h
@@ -157,8 +157,11 @@ extern "C" {
#define PAC_SOURCE_UUID "00002bcb-0000-1000-8000-00805f9b34fb"
#define PAC_SOURCE_LOC_CHRC_UUID 0x2bcc
-#define BAA_SERVICE 0x1852
-#define BAA_SERVICE_UUID "00001852-0000-1000-8000-00805f9b34fb"
+#define BCAST_AA_SERVICE 0x1852
+#define BCAST_AA_SERVICE_UUID "00001852-0000-1000-8000-00805f9b34fb"
+
+#define BASIC_AA_SERVICE 0x1851
+#define BASIC_AA_SERVICE_UUID "00001851-0000-1000-8000-00805f9b34fb"
#define PAC_CONTEXT 0x2bcd
#define PAC_SUPPORTED_CONTEXT 0x2bce
diff --git a/profiles/audio/bap.c b/profiles/audio/bap.c
index d7ce9e038..1d7a4a794 100644
--- a/profiles/audio/bap.c
+++ b/profiles/audio/bap.c
@@ -186,7 +186,7 @@ static gboolean get_uuid(const GDBusPropertyTable *property,
else if (queue_find(ep->data->srcs, NULL, ep))
uuid = PAC_SOURCE_UUID;
else
- uuid = BAA_SERVICE_UUID;
+ uuid = BASIC_AA_SERVICE_UUID;
dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &uuid);
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index bcf4eae26..e5c18970e 100644
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -1364,7 +1364,7 @@ static struct media_endpoint_init {
experimental_endpoint_supported },
{ PAC_SOURCE_UUID, endpoint_init_pac_source,
experimental_endpoint_supported },
- { BAA_SERVICE_UUID, endpoint_init_broadcast_source,
+ { BCAST_AA_SERVICE_UUID, endpoint_init_broadcast_source,
experimental_broadcaster_ep_supported },
};
diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c
index aa3a718b0..a997fab73 100644
--- a/profiles/audio/transport.c
+++ b/profiles/audio/transport.c
@@ -552,7 +552,7 @@ static DBusMessage *acquire(DBusConnection *conn, DBusMessage *msg,
owner = media_owner_create(msg);
if (!strcmp(media_endpoint_get_uuid(transport->endpoint),
- BAA_SERVICE_UUID)) {
+ BCAST_AA_SERVICE_UUID)) {
req = media_request_create(msg, 0x00);
media_owner_add(owner, req);
media_transport_set_owner(transport, owner);
@@ -1631,7 +1631,7 @@ struct media_transport *media_transport_create(struct btd_device *device,
properties = a2dp_properties;
} else if (!strcasecmp(uuid, PAC_SINK_UUID) ||
!strcasecmp(uuid, PAC_SOURCE_UUID) ||
- !strcasecmp(uuid, BAA_SERVICE_UUID)) {
+ !strcasecmp(uuid, BCAST_AA_SERVICE_UUID)) {
if (media_transport_init_bap(transport, stream) < 0)
goto fail;
properties = bap_properties;
--
2.34.1