diff --git a/android/avrcp-lib.c b/android/avrcp-lib.c
index 3c224a5..c5b54d5 100644
--- a/android/avrcp-lib.c
+++ b/android/avrcp-lib.c
set_value_rsp, session);
}
-int avrcp_get_play_status(struct avrcp *session, avctp_rsp_cb func,
- void *user_data)
+static gboolean get_play_status_rsp(struct avctp *conn,
+ uint8_t code, uint8_t subunit,
+ uint8_t *operands, size_t operand_count,
+ void *user_data)
+{
+ struct avrcp *session = user_data;
+ struct avrcp_player *player = session->player;
+ struct avrcp_header *pdu;
+ uint8_t status = 0;
+ uint32_t position = 0;
+ uint32_t duration = 0;
+ int err;
+
+ DBG("");
+
+ if (!player || !player->cfm || !player->cfm->get_play_status)
+ return FALSE;
+
+ pdu = parse_pdu(operands, operand_count);
+ if (!pdu) {
+ err = -EPROTO;
+ goto done;
+ }
+
+ if (code == AVC_CTYPE_REJECTED) {
+ err = parse_status(pdu);
+ goto done;
+ }
+
+ if (pdu->params_len < 5) {
+ err = -EPROTO;
+ goto done;
+ }
+
+ duration = bt_get_be32(&pdu->params[0]);
+ position = bt_get_be32(&pdu->params[4]);
+ status = pdu->params[8];
+ err = 0;
+
+done:
+ player->cfm->get_play_status(session, err, status, position, duration,
+ player->user_data);
+
+ return FALSE;
+}
+
+int avrcp_get_play_status(struct avrcp *session)
{
return avrcp_send_req(session, AVC_CTYPE_STATUS, AVC_SUBUNIT_PANEL,
- AVRCP_GET_PLAY_STATUS, NULL, 0, func,
- user_data);
+ AVRCP_GET_PLAY_STATUS, NULL, 0,
+ get_play_status_rsp, session);
}
int avrcp_set_volume(struct avrcp *session, uint8_t volume, avctp_rsp_cb func,
diff --git a/android/avrcp-lib.h b/android/avrcp-lib.h
index 2a65f16..f5666eb 100644
--- a/android/avrcp-lib.h
+++ b/android/avrcp-lib.h
void (*set_value) (struct avrcp *session, int err,
uint8_t number, uint8_t *attrs,
uint8_t *values, void *user_data);
+ void (*get_play_status) (struct avrcp *session, int err,
+ uint8_t status, uint32_t position,
+ uint32_t duration, void *user_data);
};
struct avrcp_passthrough_handler {
uint8_t *attrs, uint8_t *values);
int avrcp_get_current_player_value(struct avrcp *session, uint8_t number,
uint8_t *attrs);
-int avrcp_get_play_status(struct avrcp *session, avctp_rsp_cb func,
- void *user_data);
+int avrcp_get_play_status(struct avrcp *session);
int avrcp_set_volume(struct avrcp *session, uint8_t volume, avctp_rsp_cb func,
void *user_data);
int avrcp_get_element_attributes(struct avrcp *session, avctp_rsp_cb func,
diff --git a/unit/test-avrcp.c b/unit/test-avrcp.c
index 8f74e9c..ad15bb9 100644
--- a/unit/test-avrcp.c
+++ b/unit/test-avrcp.c
}
if (g_str_equal(context->data->test_name, "/TP/MDI/BV-01-C"))
- avrcp_get_play_status(context->session, NULL, NULL);
+ avrcp_get_play_status(context->session);
if (g_str_equal(context->data->test_name, "/TP/MDI/BV-03-C"))
avrcp_get_element_attributes(context->session, NULL, NULL);