Diff between 2d4b61bb2b042d516e3aaf874bd95114e03603b2 and d74ac785cb1a6ce861d039d74a05a6f46760b019

Changed Files

File Additions Deletions Status
android/avrcp-lib.c +39 -1 modified
android/avrcp-lib.h +3 -0 modified

Full Patch

diff --git a/android/avrcp-lib.c b/android/avrcp-lib.c
index 380968c..66310ac 100644
--- a/android/avrcp-lib.c
+++ b/android/avrcp-lib.c
@@ -1018,12 +1018,50 @@ int avrcp_list_player_values(struct avrcp *session, uint8_t attr)
 				list_values_rsp, session);
 }
 
+static gboolean get_value_text_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 number = 0;
+	uint8_t values[AVRCP_ATTRIBUTE_LAST];
+	char *text[AVRCP_ATTRIBUTE_LAST];
+	int err;
+
+	DBG("");
+
+	if (!player || !player->cfm || !player->cfm->get_value_text)
+		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;
+	}
+
+	err = parse_text_rsp(pdu, &number, values, text);
+
+done:
+	player->cfm->get_value_text(session, err, number, values, text,
+							player->user_data);
+
+	return FALSE;
+}
+
 int avrcp_get_player_value_text(struct avrcp *session, uint8_t attr,
 					uint8_t number, uint8_t *values)
 {
 	return avrcp_send_req(session, AVC_CTYPE_STATUS, AVC_SUBUNIT_PANEL,
 				AVRCP_GET_PLAYER_VALUE_TEXT, &attr,
-				sizeof(attr), NULL, NULL);
+				sizeof(attr), get_value_text_rsp, session);
 }
 
 int avrcp_get_current_player_value(struct avrcp *session, uint8_t *attrs,
diff --git a/android/avrcp-lib.h b/android/avrcp-lib.h
index fea4f95..0929155 100644
--- a/android/avrcp-lib.h
+++ b/android/avrcp-lib.h
@@ -176,6 +176,9 @@ struct avrcp_control_cfm {
 	void (*list_values) (struct avrcp *session, int err,
 					uint8_t number, uint8_t *values,
 					void *user_data);
+	void (*get_value_text) (struct avrcp *session, int err,
+					uint8_t number, uint8_t *values,
+					char **text, void *user_data);
 };
 
 struct avrcp_passthrough_handler {