diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
index 7799420..50c0f43 100644
--- a/profiles/audio/a2dp.c
+++ b/profiles/audio/a2dp.c
GSList *sources;
uint32_t source_record_id;
uint32_t sink_record_id;
- uint16_t version;
gboolean sink_enabled;
gboolean source_enabled;
};
.delayreport = endpoint_delayreport_ind,
};
-static sdp_record_t *a2dp_record(uint8_t type, uint16_t avdtp_ver)
+static sdp_record_t *a2dp_record(uint8_t type)
{
sdp_list_t *svclass_id, *pfseq, *apseq, *root;
uuid_t root_uuid, l2cap_uuid, avdtp_uuid, a2dp_uuid;
sdp_record_t *record;
sdp_data_t *psm, *version, *features;
uint16_t lp = AVDTP_UUID;
- uint16_t a2dp_ver = 0x0102, feat = 0x000f;
+ uint16_t a2dp_ver = 0x0103, avdtp_ver = 0x0103, feat = 0x000f;
record = sdp_record_alloc();
if (!record)
int a2dp_register(const bdaddr_t *src, GKeyFile *config)
{
gboolean source = TRUE, sink = FALSE;
- gboolean delay_reporting = FALSE;
char *str;
GError *err = NULL;
struct a2dp_server *server;
server = g_new0(struct a2dp_server, 1);
- av_err = avdtp_init(src, config, &server->version);
+ av_err = avdtp_init(src, config);
if (av_err < 0) {
g_free(server);
return av_err;
servers = g_slist_append(servers, server);
}
- if (config)
- delay_reporting = g_key_file_get_boolean(config, "A2DP",
- "DelayReporting", NULL);
-
- if (delay_reporting)
- server->version = 0x0103;
- else
- server->version = 0x0102;
-
server->source_enabled = source;
server->sink_enabled = sink;
if (*record_id != 0)
goto add;
- record = a2dp_record(type, server->version);
+ record = a2dp_record(type);
if (!record) {
error("Unable to allocate new service record");
avdtp_unregister_sep(sep->lsep);
diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c
index 75b81fe..e38c95b 100644
--- a/profiles/audio/avdtp.c
+++ b/profiles/audio/avdtp.c
struct avdtp_server {
bdaddr_t src;
- uint16_t version;
GIOChannel *io;
GSList *seps;
GSList *sessions;
goto failed;
}
- if (get_all && session->server->version < 0x0103)
- return avdtp_unknown_cmd(session, transaction, cmd);
-
if (!sep->ind->get_capability(session, sep, get_all, &caps,
&err, sep->user_data))
goto failed;
int ret = 0;
gboolean getcap_pending = FALSE;
- if (session->version >= 0x0103 && session->server->version >= 0x0103)
+ if (session->version >= 0x0103)
getcap_cmd = AVDTP_GET_ALL_CAPABILITIES;
else
getcap_cmd = AVDTP_GET_CAPABILITIES;
stream->lsep->state != AVDTP_STATE_STREAMING)
return -EINVAL;
- if (!stream->delay_reporting || session->version < 0x0103 ||
- session->server->version < 0x0103)
+ if (!stream->delay_reporting || session->version < 0x0103)
return -EINVAL;
stream->delay = delay;
bacpy(dst, &session->dst);
}
-int avdtp_init(const bdaddr_t *src, GKeyFile *config, uint16_t *version)
+int avdtp_init(const bdaddr_t *src, GKeyFile *config)
{
GError *err = NULL;
gboolean tmp, master = TRUE;
struct avdtp_server *server;
- uint16_t ver = 0x0102;
if (!config)
goto proceed;
else
auto_connect = tmp;
- if (g_key_file_get_boolean(config, "A2DP", "DelayReporting", NULL))
- ver = 0x0103;
-
proceed:
server = g_new0(struct avdtp_server, 1);
- server->version = ver;
-
- if (version)
- *version = server->version;
-
server->io = avdtp_server_socket(src, master);
if (!server->io) {
g_free(server);
diff --git a/profiles/audio/avdtp.h b/profiles/audio/avdtp.h
index 7b330b9..cdf39bf 100644
--- a/profiles/audio/avdtp.h
+++ b/profiles/audio/avdtp.h
gboolean avdtp_stream_setup_active(struct avdtp *session);
void avdtp_set_device_disconnect(struct avdtp *session, gboolean dev_dc);
-int avdtp_init(const bdaddr_t *src, GKeyFile *config, uint16_t *version);
+int avdtp_init(const bdaddr_t *src, GKeyFile *config);
void avdtp_exit(const bdaddr_t *src);