michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Audio: Fix bad warning when creating MPL OTS objects

Browse source 
The return check for adding MPL objects in OTS with
bt_ots_obj_add was incorrect, as only negative values
indicate an error, and a positive value returns the ID.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2022-10-05 15:35:27 +02:00 • committed by Fabio Baltieri
commit 8673fab276
1 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

36
subsys/bluetooth/audio/mpl.c
View file

@ -474,12 +474,14 @@ static int add_icon_object(struct mpl_mediaplayer *pl)
add_param.type.uuid_16.val = BT_UUID_16(icon_type)->val; add_param.type.uuid_16.val = BT_UUID_16(icon_type)->val;
ret = bt_ots_obj_add(bt_mcs_get_ots(), &add_param); ret = bt_ots_obj_add(bt_mcs_get_ots(), &add_param);
if (ret < 0) {
if (ret) {
BT_WARN("Unable to add icon object, error %d", ret); BT_WARN("Unable to add icon object, error %d", ret);
obj.busy = false; obj.busy = false;
return ret;
} }
return ret;
return 0;
} }
/* Add a track segments object to the OTS */ /* Add a track segments object to the OTS */
@ -507,11 +509,14 @@ static int add_current_track_segments_object(struct mpl_mediaplayer *pl)
add_param.type.uuid_16.val = BT_UUID_16(segs_type)->val; add_param.type.uuid_16.val = BT_UUID_16(segs_type)->val;
ret = bt_ots_obj_add(bt_mcs_get_ots(), &add_param); ret = bt_ots_obj_add(bt_mcs_get_ots(), &add_param);
if (ret) { if (ret < 0) {
BT_WARN("Unable to add track segments object: %d", ret); BT_WARN("Unable to add track segments object: %d", ret);
obj.busy = false; obj.busy = false;
return ret;
} }
return ret;
return 0;
} }
/* Add a single track to the OTS */ /* Add a single track to the OTS */
@ -546,13 +551,14 @@ static int add_track_object(struct mpl_track *track)
add_param.type.uuid_16.val = BT_UUID_16(track_type)->val; add_param.type.uuid_16.val = BT_UUID_16(track_type)->val;
ret = bt_ots_obj_add(bt_mcs_get_ots(), &add_param); ret = bt_ots_obj_add(bt_mcs_get_ots(), &add_param);
if (ret < 0) {
if (ret) {
BT_WARN("Unable to add track object: %d", ret); BT_WARN("Unable to add track object: %d", ret);
obj.busy = false; obj.busy = false;
return ret;
} }
return ret; return 0;
} }
/* Add the parent group to the OTS */ /* Add the parent group to the OTS */
@ -580,11 +586,14 @@ static int add_parent_group_object(struct mpl_mediaplayer *pl)
add_param.type.uuid_16.val = BT_UUID_16(group_type)->val; add_param.type.uuid_16.val = BT_UUID_16(group_type)->val;
ret = bt_ots_obj_add(bt_mcs_get_ots(), &add_param); ret = bt_ots_obj_add(bt_mcs_get_ots(), &add_param);
if (ret) { if (ret < 0) {
BT_WARN("Unable to add parent group object"); BT_WARN("Unable to add parent group object");
obj.busy = false; obj.busy = false;
return ret;
} }
return ret;
return 0;
} }
/* Add a single group to the OTS */ /* Add a single group to the OTS */
@ -620,13 +629,14 @@ static int add_group_object(struct mpl_group *group)
add_param.type.uuid_16.val = BT_UUID_16(group_type)->val; add_param.type.uuid_16.val = BT_UUID_16(group_type)->val;
ret = bt_ots_obj_add(bt_mcs_get_ots(), &add_param); ret = bt_ots_obj_add(bt_mcs_get_ots(), &add_param);
if (ret < 0) {
if (ret) {
BT_WARN("Unable to add group object: %d", ret); BT_WARN("Unable to add group object: %d", ret);
obj.busy = false; obj.busy = false;
return ret;
} }
return ret; return 0;
} }
/* Add all tracks of a group to the OTS */ /* Add all tracks of a group to the OTS */